Re: XFree86 specific patch to freetype-config.in
Matthieu Herrb wrote (in a message from Tuesday 28)
Unfortunately, -R is not a recognized option to ld on Darwin and
perhaps other platforms as well. This should be conditionalized in
some way. My configure-foo is fairly weak, but it appears that the
hardcode_libdir_flag_spec is the configure option that should be used
here, rather then a hardwired ELF loader specific option.
There's also bugzilla #832 that requests that the same is done for the
other xxx-config and xxx.pc files shipped by XFree86.
Here's the patch I intend to commit. I didn't want to use
EXTRA_LOAD_FLAGS directly, as its semantics is not clearly defined.
I've used 'hardcode_libdir_flag_spec' for consistancy with
autoconf/libtool.
Someone also mentionned possible issues on mixed 32/64 bits platforms
where a separate directory may be used for 64 bit versions of the
libraries; more work is needed in this case in other areas too...
Matthieu
Index: xc/config/cf/Imake.tmpl
===
RCS file: /cvs/xf86/xc/config/cf/Imake.tmpl,v
retrieving revision 3.151
diff -u -r3.151 Imake.tmpl
--- xc/config/cf/Imake.tmpl 29 Oct 2003 05:51:37 - 3.151
+++ xc/config/cf/Imake.tmpl 30 Oct 2003 22:52:38 -
@@ -991,6 +991,9 @@
#ifndef DefaultCplusplusOptions
#define DefaultCplusplusOptions /* floating point, etc. */
#endif
+#ifndef HardCodeLibdirFlag
+#define HardCodeLibdirFlag /**/
+#endif
#ifndef NoRConst
#define NoRConst NO /* YES if const for structs of funcs is bad */
#endif
Index: xc/config/cf/OpenBSDLib.rules
===
RCS file: /cvs/xf86/xc/config/cf/OpenBSDLib.rules,v
retrieving revision 1.9
diff -u -r1.9 OpenBSDLib.rules
--- xc/config/cf/OpenBSDLib.rules 11 Oct 2003 09:40:09 - 1.9
+++ xc/config/cf/OpenBSDLib.rules 30 Oct 2003 22:52:38 -
@@ -53,7 +53,10 @@
#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
#endif
#endif
+#ifndef HardCodeLibdirFlag
+#define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
#endif
+#endif /* UseElfFormat */
/*
* InstallSharedLibrary - generate rules to install the shared library.
Index: xc/config/cf/bsdLib.rules
===
RCS file: /cvs/xf86/xc/config/cf/bsdLib.rules,v
retrieving revision 3.24
diff -u -r3.24 bsdLib.rules
--- xc/config/cf/bsdLib.rules 18 Oct 2003 17:21:41 - 3.24
+++ xc/config/cf/bsdLib.rules 30 Oct 2003 22:52:39 -
@@ -201,6 +201,10 @@
#endif
#endif
+#ifndef HardCodeLibdirFlag
+#define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+#endif
+
#if !defined(ShlibGlobalsFlags)
#define ShlibGlobalsFlags -Wl,-Bsymbolic
#endif
Index: xc/config/cf/lnxLib.rules
===
RCS file: /cvs/xf86/xc/config/cf/lnxLib.rules,v
retrieving revision 3.51
diff -u -r3.51 lnxLib.rules
--- xc/config/cf/lnxLib.rules 25 Oct 2003 01:21:25 - 3.51
+++ xc/config/cf/lnxLib.rules 30 Oct 2003 22:52:39 -
@@ -85,7 +85,9 @@
# define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
# endif
# endif
-
+# ifndef HardCodeLibdirFlag
+# define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+# endif
# if !defined(ShlibGlobalsFlags)
# define ShlibGlobalsFlags -Wl,-Bsymbolic
# endif
Index: xc/extras/fontconfig/fontconfig-config.in
===
RCS file: /cvs/xf86/xc/extras/fontconfig/fontconfig-config.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fontconfig-config.in
--- xc/extras/fontconfig/fontconfig-config.in 4 Jun 2003 02:56:24 - 1.1.1.1
+++ xc/extras/fontconfig/fontconfig-config.in 30 Oct 2003 22:52:40 -
@@ -3,6 +3,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
[EMAIL PROTECTED]@
includedir=@includedir@
version=@PACKAGE_VERSION@
@@ -85,7 +86,7 @@
if test $echo_libs = yes ; then
libs=-lfontconfig
if test ${libdir} != /usr/lib ; then
- echo -L${libdir} $libs
+ echo ${hardcode_libdir_flag_spec} -L${libdir} $libs
else
echo $libs
fi
Index: xc/extras/fontconfig/fontconfig.pc.in
===
RCS file: /cvs/xf86/xc/extras/fontconfig/fontconfig.pc.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fontconfig.pc.in
--- xc/extras/fontconfig/fontconfig.pc.in 4 Jun 2003 02:56:24 - 1.1.1.1
+++ xc/extras/fontconfig/fontconfig.pc.in 30 Oct 2003 22:52:40 -
@@ -1,10 +1,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
Name: Fontconfig
Description: Font configuration and customization library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lfontconfig
+Libs: ${hardcode_libdir_flag_spec} -L${libdir} -lfontconfig
Cflags: -I${includedir}
Index:
Re: XFree86 specific patch to freetype-config.in
On Tue, Oct 28, 2003 at 08:13:42AM +0100, Matthieu Herrb wrote: Torrey Lyons wrote (in a message from Monday 27) The following revision to xc/extras/freetype2/builds/unix/freetype-config.in is XFree86 specific and not in the Freetype tree: revision 1.2 date: 2003/05/05 16:12:27; author: dawes; state: Exp; lines: +29 -15 159. Make freetype-config more useful on NetBSD (#5693, Thomas Klausner). cvs diff -r xf-4_3-branch -r 1.2 freetype-config.in Index: freetype-config.in === RCS file: /home/x-cvs/xc/extras/freetype2/builds/unix/freetype-config.in,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -d -b -w -r1.1.1.4 -r1.2 --- freetype-config.in 15 Feb 2002 00:33:20 - 1.1.1.4 +++ freetype-config.in 5 May 2003 16:12:27 - 1.2 @@ -90,7 +90,7 @@ if test $echo_libs = yes ; then libs=-lfreetype if test @libdir@ != /usr/lib ; then - echo [EMAIL PROTECTED]@ $libs + echo -Wl,[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $libs else echo $libs fi Unfortunately, -R is not a recognized option to ld on Darwin and perhaps other platforms as well. This should be conditionalized in some way. My configure-foo is fairly weak, but it appears that the hardcode_libdir_flag_spec is the configure option that should be used here, rather then a hardwired ELF loader specific option. There's also bugzilla #832 that requests that the same is done for the other xxx-config and xxx.pc files shipped by XFree86. I'm going to handle it. Imake gets it right for the platforms we support, so extracting the info from there would minimise duplication. David -- David Dawes X-Oz Technologies www.XFree86.org/~dawes www.x-oz.com ___ Devel mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/devel
Re: XFree86 specific patch to freetype-config.in
Torrey Lyons wrote (in a message from Monday 27) The following revision to xc/extras/freetype2/builds/unix/freetype-config.in is XFree86 specific and not in the Freetype tree: revision 1.2 date: 2003/05/05 16:12:27; author: dawes; state: Exp; lines: +29 -15 159. Make freetype-config more useful on NetBSD (#5693, Thomas Klausner). cvs diff -r xf-4_3-branch -r 1.2 freetype-config.in Index: freetype-config.in === RCS file: /home/x-cvs/xc/extras/freetype2/builds/unix/freetype-config.in,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -d -b -w -r1.1.1.4 -r1.2 --- freetype-config.in 15 Feb 2002 00:33:20 - 1.1.1.4 +++ freetype-config.in 5 May 2003 16:12:27 - 1.2 @@ -90,7 +90,7 @@ if test $echo_libs = yes ; then libs=-lfreetype if test @libdir@ != /usr/lib ; then - echo [EMAIL PROTECTED]@ $libs + echo -Wl,[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $libs else echo $libs fi Unfortunately, -R is not a recognized option to ld on Darwin and perhaps other platforms as well. This should be conditionalized in some way. My configure-foo is fairly weak, but it appears that the hardcode_libdir_flag_spec is the configure option that should be used here, rather then a hardwired ELF loader specific option. There's also bugzilla #832 that requests that the same is done for the other xxx-config and xxx.pc files shipped by XFree86. I'm going to handle it. Matthieu ___ Devel mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/devel
XFree86 specific patch to freetype-config.in
The following revision to xc/extras/freetype2/builds/unix/freetype-config.in is XFree86 specific and not in the Freetype tree: revision 1.2 date: 2003/05/05 16:12:27; author: dawes; state: Exp; lines: +29 -15 159. Make freetype-config more useful on NetBSD (#5693, Thomas Klausner). cvs diff -r xf-4_3-branch -r 1.2 freetype-config.in Index: freetype-config.in === RCS file: /home/x-cvs/xc/extras/freetype2/builds/unix/freetype-config.in,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -d -b -w -r1.1.1.4 -r1.2 --- freetype-config.in 15 Feb 2002 00:33:20 - 1.1.1.4 +++ freetype-config.in 5 May 2003 16:12:27 - 1.2 @@ -90,7 +90,7 @@ if test $echo_libs = yes ; then libs=-lfreetype if test @libdir@ != /usr/lib ; then - echo [EMAIL PROTECTED]@ $libs + echo -Wl,[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $libs else echo $libs fi Unfortunately, -R is not a recognized option to ld on Darwin and perhaps other platforms as well. This should be conditionalized in some way. My configure-foo is fairly weak, but it appears that the hardcode_libdir_flag_spec is the configure option that should be used here, rather then a hardwired ELF loader specific option. --Torrey ___ Devel mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/devel
