diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-28 23:16:41 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-29 21:21:43 +0300 |
| commit | 4693825ec3b8e7031ae4d1f57813abfd8b60d63b (patch) | |
| tree | ca13ff7683686a6940f0b4ba136800545430b905 /packages/patches/tiff/patch-tif_config.diff | |
| parent | 1d8d36b67c1045e69afe6c40f771f438735457a9 (diff) | |
Build pkg-config as 64bit only, libtiff as universal and remove gtk-quartz-engine.py
We hit troubles (https://github.com/mono/mono/issues/13804) which are apparently related to lipo'ing so move the three packages that use it away from it.
- pkg-config doesn't build as universal since the internal glib doesn't build because of 32/64bit configure mismatches (we'd need to do similar patches to what we do in glib.py) so just make it 64bit only.
- libtiff also runs into the 32/64bit configure mismatch but we can fix it with a simple patch.
I tested it works by running the repro from https://xamarin.github.io/bugzilla-archives/39/39865/bug.html .
- gtk-quartz-engine.py is no longer used by MD/VSMac according to the team so remove it completely.
Diffstat (limited to 'packages/patches/tiff/patch-tif_config.diff')
| -rw-r--r-- | packages/patches/tiff/patch-tif_config.diff | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/packages/patches/tiff/patch-tif_config.diff b/packages/patches/tiff/patch-tif_config.diff new file mode 100644 index 0000000..81f21c9 --- /dev/null +++ b/packages/patches/tiff/patch-tif_config.diff @@ -0,0 +1,81 @@ +--- libtiff/tif_config.h.orig 2019-08-29 15:36:35.000000000 +0200 ++++ libtiff/tif_config.h 2019-08-29 15:08:43.000000000 +0200 +@@ -255,7 +255,11 @@ + #define SIZEOF_SIGNED_INT 4 + + /* The size of `signed long', as computed by sizeof. */ ++#ifdef __LP64__ + #define SIZEOF_SIGNED_LONG 8 ++#else ++#define SIZEOF_SIGNED_LONG 4 ++#endif + + /* The size of `signed long long', as computed by sizeof. */ + #define SIZEOF_SIGNED_LONG_LONG 8 +@@ -264,16 +268,28 @@ + #define SIZEOF_SIGNED_SHORT 2 + + /* The size of `size_t', as computed by sizeof. */ ++#ifdef __LP64__ + #define SIZEOF_SIZE_T 8 ++#else ++#define SIZEOF_SIZE_T 4 ++#endif + + /* The size of `unsigned char *', as computed by sizeof. */ ++#ifdef __LP64__ + #define SIZEOF_UNSIGNED_CHAR_P 8 ++#else ++#define SIZEOF_UNSIGNED_CHAR_P 4 ++#endif + + /* The size of `unsigned int', as computed by sizeof. */ + #define SIZEOF_UNSIGNED_INT 4 + + /* The size of `unsigned long', as computed by sizeof. */ ++#ifdef __LP64__ + #define SIZEOF_UNSIGNED_LONG 8 ++#else ++#define SIZEOF_UNSIGNED_LONG 4 ++#endif + + /* The size of `unsigned long long', as computed by sizeof. */ + #define SIZEOF_UNSIGNED_LONG_LONG 8 +@@ -307,10 +323,18 @@ + #define TIFF_INT32_T signed int + + /* Signed 64-bit type formatter */ ++#ifdef __LP64__ + #define TIFF_INT64_FORMAT "%ld" ++#else ++#define TIFF_INT64_FORMAT "%lld" ++#endif + + /* Signed 64-bit type */ ++#ifdef __LP64__ + #define TIFF_INT64_T signed long ++#else ++#define TIFF_INT64_T signed long long ++#endif + + /* Signed 8-bit type */ + #define TIFF_INT8_T signed char +@@ -343,10 +367,18 @@ + #define TIFF_UINT32_T unsigned int + + /* Unsigned 64-bit type formatter */ ++#ifdef __LP64__ + #define TIFF_UINT64_FORMAT "%lu" ++#else ++#define TIFF_UINT64_FORMAT "%llu" ++#endif + + /* Unsigned 64-bit type */ ++#ifdef __LP64__ + #define TIFF_UINT64_T unsigned long ++#else ++#define TIFF_UINT64_T unsigned long long ++#endif + + /* Unsigned 8-bit type */ + #define TIFF_UINT8_T unsigned char |