[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 4.3.0] Xrender and Xft incorrect symlink in debian/rules



 xfree86_4.3.0-0pre1v5 fail to build on alpha with this error,
perhaps it is architecture independent problem.

+ gcc -o ./libXft.so.1.1~ -shared -Wl,-soname,libXft.so.1 xftcfg.o xftcolor.o xftcore.o xftdbg.o xftdpy.o xftdraw.o xftextent.o xftfont.o xftfs.o xftinit.o xftlist.o xftmatch.o xftmatrix.o xftname.o xftpat.o xftstr.o xftxlfd.o xftfreetype.o xftglyphs.o xftrender.o xftdir.o -L../../exports/lib -L../../../../debian/local/exports/lib -lXrender -lXext -lX11 -lfontconfig -lexpat -lfreetype -lc
/usr/bin/ld: ../../../../debian/local/exports/lib/libXrender.a(Xrender.o): gp-relative relocation against dynamic symbol XRenderExtensionName
/usr/bin/ld: ../../../../debian/local/exports/lib/libXrender.a(Xrender.o): gp-relative relocation against dynamic symbol XRenderExtensionName
collect2: ld returned 1 exit status
+ rm -f libXft.so.1
+ ln -s libXft.so.1.1 libXft.so.1
+ rm -f ../../exports/lib/libXft.so.1
+ cd ../../exports/lib
+ ln -s ../../lib/Xft1/libXft.so.1 .
rm -f libXft.so.1.1
mv -f libXft.so.1.1~ libXft.so.1.1
mv: cannot stat `libXft.so.1.1~': No such file or directory
make[5]: *** [libXft.so.1.1] Error 1
make[5]: Leaving directory `/home/ishikawa/work/XFree86/4.3.0/xfree86-4.3.0/build-tree/xc/lib/Xft1'


 It is because there is no libXrender.so under
debian/local/exports/lib.

 debian/local/exports/lib/lib* symlinks generate in debian/rules
like this:

        # Xrender
        ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib

 libXrender library is moved to /usr/lib after
libxrender{1,-dev}_0.8.3-1, we should refrect this change to
debian/rules. libXft is also moved to /usr/lib, it is better to
refrect them.

Index: debian/rules
===================================================================
--- debian/rules	(revision 875)
+++ debian/rules	(working copy)
@@ -206,11 +206,11 @@
 	# not limited to, -I/usr/include).
 	mkdir -p debian/local/exports/lib
 	mkdir -p debian/local/exports/include/X11/extensions
-	ln -s /usr/X11R6/lib/libXft* debian/local/exports/lib
+	ln -s /usr/lib/libXft* debian/local/exports/lib
 	rm -f debian/local/exports/lib/libXft.so.1* debian/local/exports/lib/libXft1*
 	ln -s /usr/include/X11/Xft debian/local/exports/include/X11
 	# Xrender
-	ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib
+	ln -s /usr/lib/libXrender.* debian/local/exports/lib
 	ln -s /usr/include/X11/extensions/Xrender.h debian/local/exports/include/X11/extensions
 	# Xcursor
 	ln -s /usr/lib/libXcursor.* debian/local/exports/lib
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 875)
+++ debian/changelog	(working copy)
@@ -10,6 +10,16 @@
                 (#6006, Matthias Scheler).
     - debian/patches/000_stolen_from_HEAD_i830_driver.diff: resync offsets
 
+  * libXrender and libXft link problem fix:
+    - debian/rules:
+      + libXrender.* moved from /usr/X11R6/lib to /usr/lib after 0.8.3-1,
+        generateing symlink in debian/rules refrect this change.
+      + libXrender.* moved from /usr/X11R6/lib to /usr/lib after 2.1.2-1,
+        generateing symlink in debian/rules refrect this change.
+    - debian/control
+      + Build-Depend update to correct version of libxft-dev and
+        libxrender-dev
+
  -- Branden Robinson <branden@debian.org>  Wed, 24 Dec 2003 18:34:08 -0500
 
 xfree86 (4.3.0-0pre1v5) experimental; urgency=low
Index: debian/control
===================================================================
--- debian/control	(revision 875)
+++ debian/control	(working copy)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Branden Robinson <branden@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [i386 alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libxrender-dev, libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [i386 alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2-1), libxrender-dev (>= 0.8.3-1), libxcursor-dev, dbs, m4
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
 
 Package: lbxproxy


-- 
ISHIKAWA Mutsumi
 <ishikawa@netvillage.co.jp>, <ishikawa@linux.or.jp>, <ishikawa@debian.org>



Reply to: