Package: faketime
Version: 0.9.1-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * as-needed.patch: Fix object/library link order for --as-needed.

When building with --as-needed, libraries need to be listed on the
link line after the objects that reference them.  In the autotools
world (and elsewhere), the LDFLAGS variable has been split into
LDFLAGS and LDADD to represent the need to list libs last.  This
patch makes that change to your Makefile, so this builds correctly
with --as-needed in LDFLAGS.

... Adam

-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.9.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru faketime-0.9.1/debian/changelog faketime-0.9.1/debian/changelog
diff -Nru faketime-0.9.1/debian/patches/as-needed.patch faketime-0.9.1/debian/patches/as-needed.patch
--- faketime-0.9.1/debian/patches/as-needed.patch	1969-12-31 17:00:00.000000000 -0700
+++ faketime-0.9.1/debian/patches/as-needed.patch	2013-06-11 07:50:42.000000000 -0600
@@ -0,0 +1,25 @@
+Description: Fix link order for --as-needed.
+Author: Adam Conrad <adcon...@ubuntu.com>
+Forwarded: no
+
+--- faketime-0.9.1.orig/src/Makefile
++++ faketime-0.9.1/src/Makefile
+@@ -53,7 +53,8 @@ INSTALL ?= install
+ PREFIX ?= /usr/local
+ 
+ CFLAGS += -std=gnu99 -Wall -DFAKE_STAT -DFAKE_INTERNAL_CALLS -fPIC -DPOSIX_REALTIME -DLIMITEDFAKING -DSPAWNSUPPORT
+-LDFLAGS += -shared -ldl -lm -lpthread
++LDFLAGS += -shared
++LDADD += -ldl -lm -lpthread
+ 
+ SRC = faketime.c
+ OBJ = faketime.o faketimeMT.o
+@@ -69,7 +70,7 @@ ${OBJ}: faketime.c
+ 	${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $<
+ 
+ lib%.so.${SONAME}: %.o
+-	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $<
++	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $< ${LDADD}
+ 
+ clean: 
+ 	@rm -f ${OBJ} ${LIBS}
diff -Nru faketime-0.9.1/debian/patches/series faketime-0.9.1/debian/patches/series
--- faketime-0.9.1/debian/patches/series	2013-06-09 17:33:51.000000000 -0600
+++ faketime-0.9.1/debian/patches/series	2013-06-11 07:46:19.000000000 -0600
@@ -1,2 +1,3 @@
 fix-build-system.patch
 fix-infinite-recursion-on-real_clock_gettime.patch
+as-needed.patch

Reply via email to