From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 30 Aug 2015 00:11:51 +0000 (-0600)
Subject: Use gcc for linking on Linux
X-Git-Tag: v6.6.3~1
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=8ba880a396dfe787a9aefddc1c011ac2bc8e244a

Use gcc for linking on Linux
---

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index d67afe1..de42b71 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -30,7 +30,7 @@ CFLAGS:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -
 LDFLAGS:=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
 CFLAGS32:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
-LDFLAGS32:=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
+LDFLAGS32:=-L/lib32 -L/usr/lib32 -lmysqlclient -lz -lc
 
 ifneq ($(OS_CYGWIN),0)
   CFLAGS:=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
@@ -64,14 +64,14 @@ else
         else
           ifneq ($(OS_LINUX64),0)
 	    gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-	    ld $(LDFLAGS) -shared -soname=$(base) $(object) -o $(shared64_lib)
+	    gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
 	    rm $(object)
 	    @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
 	    -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
-	    -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+	    -gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS32) -o $(shared_lib)
           else
 	    gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-	    ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+	    gcc -m32 $(LDFLAGS) -fPIC  -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS) -o $(shared_lib)
           endif
         endif
       endif
diff --git a/debian/changelog b/debian/changelog
index 9ab9dac..50e7bba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (6.6.3-2) unstable; urgency=medium
+
+  * Use gcc for linking (closes:755064)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 29 Aug 2015 18:10:24 -0600
+
 cl-sql (6.6.3-1) unstable; urgency=medium
 
   * New upstream
diff --git a/uffi/Makefile b/uffi/Makefile
index 77203fd..7599380 100644
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -55,11 +55,11 @@ else
         else
           ifneq ($(OS_LINUX64),0)
 	    gcc $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
-	    ld $(LDFLAGS) -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
+	    gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib)
 	    rm -f $(object)
 	    @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
 	    -gcc -m32 $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
-	    -ld -melf_i386 $(LDFLAGS) -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+	    -gcc -m32 $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared_lib)
           else
 	    gcc -fPIC -DPIC -c $(source) -o $(object)
 	    ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)