Package: gip Version: 1.7.0-1-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * Add 50-installer-build_files-sh.diff to link libs correctly. Fixes FTBFS. (LP: #771081) Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff --- gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff 1969-12-31 19:00:00.000000000 -0500 +++ gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff 2011-09-16 14:39:33.000000000 -0400 @@ -0,0 +1,29 @@ +Description: Fix placement of libs in linking stages for GCC 4.6 +Author: Daniel T Chen <crim...@ubuntu.com> +Reviewed-by: Daniel T Chen <crim...@ubuntu.com> +Origin: Ubuntu +Forwarded: no +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gip/+bug/771081 +Last-Updated: 2011-09-15 + +Index: gip-1.7.0-1/installer/build_files.sh +=================================================================== +--- gip-1.7.0-1.orig/installer/build_files.sh 2011-09-16 14:33:30.000000000 -0400 ++++ gip-1.7.0-1/installer/build_files.sh 2011-09-16 14:34:33.000000000 -0400 +@@ -122,14 +122,14 @@ + if [ "$SHARED" = "" ]; then + # Link as an executable. + set -x +- g++ $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES ++ g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + else + # Link as a shared library. + SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'` + set -x +- g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES ++ g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + fi diff -Nru gip-1.7.0-1/debian/patches/series gip-1.7.0-1/debian/patches/series --- gip-1.7.0-1/debian/patches/series 2010-08-31 18:10:45.000000000 -0400 +++ gip-1.7.0-1/debian/patches/series 2011-09-16 14:33:27.000000000 -0400 @@ -2,3 +2,4 @@ 20-build-sh.diff 30-gip-desktop.diff 40-init_lock_events.diff +50-installer-build_files-sh.diff