tags 476018 + patch tags 478534 + patch thanks Hi!
Please find attached a patch to fix this bug. The patch does the following: 1. Regenerates the copyright hints. 2. Removes the "-Wl,--disable-rpath" ld flag, which doesn't seem to exist. Anyway, rpath issues don't arise since --disable-rpath is passed to configure anyway. 3. Adds a proper check to detect cross building. I hope you are able to use this patch to fix this RC bug. Thanks. Kumar -- Kumar Appaiah, 458, Jamuna Hostel, Indian Institute of Technology Madras, Chennai - 600 036
diff -Nru --exclude changelog /tmp/w9RpKR3FZG/libgd2-2.0.36~rc1~dfsg/debian/copyright_hints /tmp/9BsZKtOXz0/libgd2-2.0.36~rc1~dfsg/debian/copyright_hints --- libgd2-2.0.36~rc1~dfsg/debian/copyright_hints 2008-05-02 13:41:01.000000000 +0530 +++ libgd2-2.0.36~rc1~dfsg/debian/copyright_hints 2008-05-02 13:41:01.000000000 +0530 @@ -98,11 +98,10 @@ depcomp BSD (3 clause) [1998 Todd C. Miller <[EMAIL PROTECTED]>]: strlcpy.c GENERATED FILE [1992-1996, 1998-2001]: configure -GENERATED FILE [© 1997-2007 Thomas Boutell, Pierre-Alain Joye and contributors, see COPYING\0"]: windows/libgd.rc +GENERATED FILE [1997-2007 Thomas Boutell, Pierre-Alain Joye and contributors, see COPYING\0"]: windows/libgd.rc GPL-2+ GENERATED FILE [1996-2001, 2003-2005]: config/ltmain.sh UNKNOWN [1991-1996, Thomas G. Lane]: gd_topal.c UNKNOWN [1994-1996, 1999-2002 Free Software]: INSTALL -UNKNOWN [1996-2004 / 2000-2002 Free Software Foundation, Inc]: aclocal.m4 UNKNOWN [1996-2007 Boutell.Com, Inc]: netware/Makefile UNKNOWN [1999 Greg Roelofs and Thomas Boutell]: gd_png.c UNKNOWN [1999, Philip Warner]: gd_gd2.c @@ -110,5 +109,4 @@ UNKNOWN [2000 Doug Becker, mailto:[EMAIL PROTECTED]: gd_jpeg.c UNKNOWN [notice and this permission notice appear in supporting / notice appear in all copies and that both that / 1991 by the Massachusetts Institute of Technology]: install-sh UNKNOWN [notice and this permission notice appear in supporting / notice appear in all copies and that both that / Johan Van den Brande ([EMAIL PROTECTED]) / Maurice Szmurlo --- T-SIT --- January 2000]: gd_wbmp.c -UNKNOWN [notice appear in all copies and that both that / 1991 by the Massachusetts Institute of Technology / notice and this permission notice appear in supporting]: config/install-sh UNKNOWN [property of / notice and this permission notice appear in supporting / notice appear in all copies and that both that / 1989 by Jef Poskanzer]: gd_gif_out.c diff -Nru --exclude changelog /tmp/w9RpKR3FZG/libgd2-2.0.36~rc1~dfsg/debian/rules /tmp/9BsZKtOXz0/libgd2-2.0.36~rc1~dfsg/debian/rules --- libgd2-2.0.36~rc1~dfsg/debian/rules 2008-05-02 13:41:01.000000000 +0530 +++ libgd2-2.0.36~rc1~dfsg/debian/rules 2008-05-02 13:41:01.000000000 +0530 @@ -32,7 +32,7 @@ # compile flags COMPILER = gcc -CFLAGS += -D_REENTRANT -pipe -Wl,--disable-rpath +CFLAGS += -D_REENTRANT -pipe # build dirs, targets and binaries BUILD-ARCH-TARGETS = build-libgd2-noxpm build-libgd2-xpm @@ -45,6 +45,12 @@ DEB_SHLIBDEPS_LIBRARY_ALL = -Llibgd2-noxpm -ldebian/libgd2-noxpm/usr/lib +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + common-configure-arch common-configure-indep:: configure-stamp configure-stamp: dh_testdir @@ -52,8 +58,8 @@ chmod a+x debian/rules configure cp -f /usr/share/misc/config.* config/ -mkdir $(BUILD-ARCH-TARGETS) - cd $(CURDIR)/build-libgd2-noxpm && ../configure --prefix=/usr --without-x --without-xpm --without-fontconfig --disable-rpath - cd $(CURDIR)/build-libgd2-xpm && ../configure --prefix=/usr --with-x --disable-rpath + cd $(CURDIR)/build-libgd2-noxpm && ../configure $(CROSS) --prefix=/usr --without-x --without-xpm --without-fontconfig --disable-rpath + cd $(CURDIR)/build-libgd2-xpm && ../configure $(CROSS) --prefix=/usr --with-x --disable-rpath touch $@ # Build shared libc6 library without Xpm support.
signature.asc
Description: Digital signature
