summaryrefslogtreecommitdiffstats
path: root/source/l
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsource/l/libiodbc/libiodbc.SlackBuild4
-rw-r--r--source/l/libiodbc/libiodbc.disable.rpath.diff12
2 files changed, 10 insertions, 6 deletions
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=""