Package: clasp
Version: 2.0.1-1
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpTSfYgn
In Ubuntu, the attached patch was applied to achieve the following:
* Use LIBS instead of LDFLAGS for linking to libraries. Fixes FTBFS with ld's
--as-needed
Patch also forwarded upstream:
https://sourceforge.net/tracker/?func=detail&aid=3324430&group_id=238741&atid=1107486
But we'd appreciate it if you could include it, should you do any
uploads before then.
Thanks for considering the patch.
SR
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0-1-generic (SMP w/2 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Fix build failure with ld --as-needed.
Author: Stefano Rivera <[email protected]>
Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3324430&group_id=238741&atid=1107486
Last-Update: 2011-06-22
--- a/configure.sh
+++ b/configure.sh
@@ -11,6 +11,7 @@
CONFIG=""
# CONFIGURATION
LDFLAGS=""
+LIBS=""
BUILDPATH=""
CXXFLAGS=""
INSTALLPATH=""
@@ -166,7 +167,7 @@
exit 1
fi
CXXFLAGS="${CXXFLAGS} -I${TBB_INCLUDE}"
- LDFLAGS="${LDFLAGS} -ltbb -L${TBB_LIB}"
+ LIBS="${LIBS} -ltbb -L${TBB_LIB}"
if [[ $rpath == 1 ]]; then
LDFLAGS="${LDFLAGS} -Xlinker \"--rpath=${TBB_LIB}\""
fi
@@ -195,6 +196,7 @@
ROOTPATH="../.."
LIB_CLASP="libclasp"
LIB_OPTS="libprogram_opts"
+LIBS="${LIB_CLASP}/lib/${LIB_CLASP}.a ${LIB_OPTS}/lib/${LIB_OPTS}.a ${LIBS}"
mkdir -p $BUILDPATH/app
mkdir -p $BUILDPATH/bin
mkdir -p $BUILDPATH/$LIB_CLASP/lib
@@ -213,6 +215,7 @@
echo "CXXFLAGS := ${CXXFLAGS}" >> FLAGS
echo "WARNFLAGS := -W -Wall" >> FLAGS
echo "LDFLAGS := ${LDFLAGS}" >> FLAGS
+echo "LIBS := ${LIBS}" >> FLAGS
echo "" >> FLAGS
# create Makefiles
@@ -231,7 +234,7 @@
echo "OUT_DIR := app" >> .CONFIG
echo "INCLUDES := -I\$(PROJECT_ROOT)/${LIB_CLASP}
-I\$(PROJECT_ROOT)/${LIB_OPTS}" >> .CONFIG
echo "SUBDIRS := ${LIB_CLASP} ${LIB_OPTS}" >> .CONFIG
-echo "LIBS := ${LIB_CLASP}/lib/${LIB_CLASP}.a
${LIB_OPTS}/lib/${LIB_OPTS}.a" >> .CONFIG
+echo "LIBS := ${LIBS}" >> .CONFIG
echo "INSTALL_DIR := ${INSTALLPATH}" >> .CONFIG
if [ ! -z "$POST_BUILD" ]; then
echo "POST_BUILD := $POST_BUILD" >> .CONFIG