diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-06-04 23:01:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-06-05 08:59:48 +0200 |
commit | fab5e089ce3135a09ce2fb49c73eb7353a2e4900 (patch) | |
tree | 037e224001f259ac5ac373c61bb2bfdec50b857c /source/l/glib | |
parent | b733529ab9ca9a45ee5cf9c60adee9a96e5ab217 (diff) | |
download | current-fab5e089ce3135a09ce2fb49c73eb7353a2e4900.tar.gz |
Tue Jun 4 23:01:52 UTC 201920190604230152
a/hwdata-0.324-noarch-1.txz: Upgraded.
a/kernel-generic-4.19.48-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.48-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.48-x86_64-1.txz: Upgraded.
ap/cups-filters-1.24.0-x86_64-1.txz: Upgraded.
ap/gphoto2-2.5.23-x86_64-1.txz: Upgraded.
ap/sysstat-12.1.5-x86_64-1.txz: Upgraded.
d/Cython-0.29.10-x86_64-1.txz: Upgraded.
d/cmake-3.14.5-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.48-x86-1.txz: Upgraded.
k/kernel-source-4.19.48-noarch-1.txz: Upgraded.
l/Mako-1.0.11-x86_64-1.txz: Upgraded.
l/harfbuzz-2.5.1-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_48-x86_64-1.txz: Upgraded.
l/libgphoto2-2.5.23-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/glib')
-rw-r--r-- | source/l/glib/glib-1.2.10-gcc9.patch | 39 | ||||
-rwxr-xr-x | source/l/glib/glib.SlackBuild | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/source/l/glib/glib-1.2.10-gcc9.patch b/source/l/glib/glib-1.2.10-gcc9.patch new file mode 100644 index 00000000..36547e4f --- /dev/null +++ b/source/l/glib/glib-1.2.10-gcc9.patch @@ -0,0 +1,39 @@ +--- glib.h ++++ glib.h +@@ -535,9 +535,10 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT16_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("rorw $8, %w0" \ ++ __asm__ ("rorw $8, %w0" \ + : "=r" (__v) \ +- : "0" ((guint16) (val))); \ ++ : "0" ((guint16) (val)) \ ++ : "cc"); \ + __v; })) + # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_X86 (val)) + # if !defined(__i486__) && !defined(__i586__) \ +@@ -548,11 +549,12 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("rorw $8, %w0\n\t" \ ++ __asm__ ("rorw $8, %w0\n\t" \ + "rorl $16, %0\n\t" \ + "rorw $8, %w0" \ + : "=r" (__v) \ +- : "0" ((guint32) (val))); \ ++ : "0" ((guint32) (val)) \ ++ : "cc"); \ + __v; })) + # else /* 486 and higher has bswap */ + # define GUINT32_SWAP_LE_BE_X86(val) \ +@@ -561,7 +563,7 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("bswap %0" \ ++ __asm__ ("bswap %0" \ + : "=r" (__v) \ + : "0" ((guint32) (val))); \ + __v; })) diff --git a/source/l/glib/glib.SlackBuild b/source/l/glib/glib.SlackBuild index afefe9e4..e72719dd 100755 --- a/source/l/glib/glib.SlackBuild +++ b/source/l/glib/glib.SlackBuild @@ -77,6 +77,7 @@ zcat $CWD/glib-1.2.10-unused-dep.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/glib-1.2.10-autotools.patch.gz | patch -p0 --verbose || exit 1 zcat $CWD/glib-1.2.10-format.patch.gz | patch -p0 --verbose || exit 1 zcat $CWD/glib-1.2.10-gcc5.patch.gz | patch -p0 --verbose || exit 1 +zcat $CWD/glib-1.2.10-gcc9.patch | patch -p0 --verbose || exit 1 # The original config.{guess,sub} do not work on x86_64 and some other $ARCH: cp -p /usr/share/libtool/build-aux/config.{guess,sub} . |