From c9d989088a97c123fd0d3a6819538b242763a91f Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 14 Aug 2019 05:24:55 +0000
Subject: Wed Aug 14 05:24:55 UTC 2019

a/kernel-generic-4.19.66-x86_64-2.txz:  Upgraded.
  Recompiled with gcc-9.2.0.
a/kernel-huge-4.19.66-x86_64-2.txz:  Upgraded.
  Recompiled with gcc-9.2.0.
a/kernel-modules-4.19.66-x86_64-2.txz:  Upgraded.
  Recompiled with gcc-9.2.0.
d/gcc-9.2.0-x86_64-1.txz:  Upgraded.
  Everything rebuilt fine with this except for xfsdump, which seems to be due
  to the recent xfsprogs upgrade.
d/gcc-brig-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-g++-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gdc-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gfortran-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gnat-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-go-9.2.0-x86_64-1.txz:  Upgraded.
d/gcc-objc-9.2.0-x86_64-1.txz:  Upgraded.
d/git-2.22.1-x86_64-1.txz:  Upgraded.
d/help2man-1.47.11-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.66-x86-2.txz:  Upgraded.
d/python-pip-19.2.2-x86_64-1.txz:  Upgraded.
d/re2c-1.2.1-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.66-noarch-2.txz:  Upgraded.
l/imagemagick-6.9.10_60-x86_64-1.txz:  Upgraded.
l/libiodbc-3.52.13-x86_64-1.txz:  Upgraded.
x/xf86-input-libinput-0.29.0-x86_64-1.txz:  Upgraded.
x/xrandr-1.5.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.22-x86_64-2.txz:  Rebuilt.
  Add nm-applet.mo -> network-manager-applet.mo symlinks to get LC_MESSAGES
  working again. Thanks to TurboBlaze.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/l/libiodbc/libiodbc.SlackBuild         |  4 ++++
 source/l/libiodbc/libiodbc.disable.rpath.diff | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source/l')

diff --git a/source/l/libiodbc/libiodbc.SlackBuild b/source/l/libiodbc/libiodbc.SlackBuild
index a8e71429e..55906d06b 100755
--- a/source/l/libiodbc/libiodbc.SlackBuild
+++ b/source/l/libiodbc/libiodbc.SlackBuild
@@ -78,6 +78,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ ! -r configure ]; then
+  NOCONFIGURE=1 ./autogen.sh
+fi
+
 # Configure:
 # We add '--disable-libodbc'. This way, a libodbc.so library does not get
 # installed so that this package won't clash with an already present unixodbc.
diff --git a/source/l/libiodbc/libiodbc.disable.rpath.diff b/source/l/libiodbc/libiodbc.disable.rpath.diff
index a5f9701db..e54bff460 100644
--- a/source/l/libiodbc/libiodbc.disable.rpath.diff
+++ b/source/l/libiodbc/libiodbc.disable.rpath.diff
@@ -1,11 +1,11 @@
---- ./libtool.orig	2013-12-11 17:33:25.828622889 -0600
-+++ ./libtool	2013-12-11 17:39:28.910619029 -0600
-@@ -363,7 +363,7 @@
+--- ./libtool.orig	2019-08-12 18:34:20.894114692 -0500
++++ ./libtool	2019-08-12 18:35:06.793116162 -0500
+@@ -379,7 +379,7 @@
  
  # Flag to hardcode $libdir into a binary during linking.
  # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
+-hardcode_libdir_flag_spec="\$wl-rpath \$wl\$libdir"
 +hardcode_libdir_flag_spec=""
  
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=""
-- 
cgit v1.2.3-65-gdbad