projects / packages / argyllcms.git / blame
| Commit | Line | Data |
|---|---|---|
| cfc14e1c JP |
1 | diff -ur Argyll_V2.3.0.orig/Jambase Argyll_V2.3.0/Jambase |
| 2 | --- Argyll_V2.3.0.orig/Jambase 2021-12-23 23:37:07.000000000 +0100 | |
| 3 | +++ Argyll_V2.3.0/Jambase 2022-04-24 21:01:17.080866907 +0200 | |
| 4 | @@ -1011,16 +1011,6 @@ | |
| 5 | HOSTTYPE = $(JAMUNAME[1]) ; | |
| 6 | } | |
| 7 | ||
| 8 | - if $(HOSTTYPE) = x86_64 | |
| 9 | - || $(HOSTTYPE) = x86_64-linux | |
| 10 | - || $(HOSTTYPE) = amd64 { | |
| 11 | - ECHO "We're on a 64 bit host" ; | |
| 12 | - HOST64 = true ; | |
| 13 | - CCFLAGS += -m64 ; | |
| 14 | - C++FLAGS += -m64 ; | |
| 15 | - } | |
| 16 | - | |
| 17 | - | |
| 18 | # Hmm. Newer linux gcc ar defaults to no timestamps | |
| 19 | # and introduces a new option to get old behaviour, | |
| 20 | # breaking the dependency determination. | |
| 21 | diff -ur Argyll_V2.3.0.orig/Jamtop Argyll_V2.3.0/Jamtop | |
| 22 | --- Argyll_V2.3.0.orig/Jamtop 2021-12-23 23:37:07.000000000 +0100 | |
| 23 | +++ Argyll_V2.3.0/Jamtop 2022-04-24 21:01:08.610422555 +0200 | |
| 24 | @@ -162,6 +162,7 @@ | |
| 25 | if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ] | |
| 26 | || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ] | |
| 27 | || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ] | |
| 28 | + || [ GLOB /usr/libx32 : lib$(lcase).so ] || [ GLOB /usr/libx32 : lib$(lcase).a ] | |
| 29 | || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ] | |
| 30 | || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ] | |
| 31 | || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ] |