diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/gphoto2/gphoto2.SlackBuild | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.48 (renamed from source/k/kernel-configs/config-generic-4.19.47) | 3 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.48.x64 (renamed from source/k/kernel-configs/config-generic-4.19.47.x64) | 3 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.48-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.47-smp) | 3 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.48 (renamed from source/k/kernel-configs/config-huge-4.19.47) | 3 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.48.x64 (renamed from source/k/kernel-configs/config-huge-4.19.47.x64) | 3 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.48-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.47-smp) | 3 | ||||
-rw-r--r-- | source/l/FTBFSlog | 5 | ||||
-rw-r--r-- | source/l/glib/glib-1.2.10-gcc9.patch | 39 | ||||
-rwxr-xr-x | source/l/glib/glib.SlackBuild | 1 |
10 files changed, 58 insertions, 7 deletions
diff --git a/source/ap/gphoto2/gphoto2.SlackBuild b/source/ap/gphoto2/gphoto2.SlackBuild index 03c29a1aa..1ef238b30 100755 --- a/source/ap/gphoto2/gphoto2.SlackBuild +++ b/source/ap/gphoto2/gphoto2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gphoto2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/k/kernel-configs/config-generic-4.19.47 b/source/k/kernel-configs/config-generic-4.19.48 index 85654f616..71e7aa31f 100644 --- a/source/k/kernel-configs/config-generic-4.19.47 +++ b/source/k/kernel-configs/config-generic-4.19.48 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/k/kernel-configs/config-generic-4.19.47.x64 b/source/k/kernel-configs/config-generic-4.19.48.x64 index 93f4c6d5a..db7cf5a07 100644 --- a/source/k/kernel-configs/config-generic-4.19.47.x64 +++ b/source/k/kernel-configs/config-generic-4.19.48.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/k/kernel-configs/config-generic-smp-4.19.47-smp b/source/k/kernel-configs/config-generic-smp-4.19.48-smp index 187bf723b..df2cfe68a 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.47-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.48-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/k/kernel-configs/config-huge-4.19.47 b/source/k/kernel-configs/config-huge-4.19.48 index 318c79951..5296fc3cd 100644 --- a/source/k/kernel-configs/config-huge-4.19.47 +++ b/source/k/kernel-configs/config-huge-4.19.48 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/k/kernel-configs/config-huge-4.19.47.x64 b/source/k/kernel-configs/config-huge-4.19.48.x64 index cd8640900..899d87305 100644 --- a/source/k/kernel-configs/config-huge-4.19.47.x64 +++ b/source/k/kernel-configs/config-huge-4.19.48.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/k/kernel-configs/config-huge-smp-4.19.47-smp b/source/k/kernel-configs/config-huge-smp-4.19.48-smp index 710f21021..381cac41d 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.47-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.48-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.47 Kernel Configuration +# Linux/x86 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index 3cd6a9daf..a9b36139e 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,8 @@ +Mon Jun 3 17:08:10 UTC 2019 + glib: patch for gcc9. Thanks to Matteo Bernardini. + Note that on 32-bit x86, xmms and normalize will not recompile until glib-1 + has been rebuilt with this patch. ++--------------------------+ Mon May 20 04:25:26 UTC 2019 mozjs52: --disable-tests. Thanks to Matteo Bernardini. +--------------------------+ 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 000000000..36547e4fb --- /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 afefe9e4c..e72719dd7 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} . |