Re: Heads up on Pango HEAD

[Erwann Chenede <Erwann Chenede sun com>]

Hi Keith,

>
>I've got a patch submitted that uses the -G flag on solaris; which is
>preferred?

The preferred way would be -G -z text -z defs for the solaris linker as
Toshi pointed out. As -G on its own allows undefined symbols in the shared
lib.

Please in attached a new patches for the configure.in files in Xft and
fontconfig
 
 Cheers,
 
 	Erwann




Erwann
>
>Keith Packard        XFree86 Core Team        HP Cambridge Research Lab
>
>

 Erwann Chénedé, Sun Microsystems, Ireland
 Phone  : +353 1 8199031         xt: 19031
[ I speak for myself, not for my employer ]

--- /tmp/tmp/fcpackage.02-06-03.01-31/Xft/configure.in	Fri May 24 00:01:56 2002
+++ configure.in	Fri Jun  7 18:34:23 2002
@@ -57,6 +57,19 @@
 AC_DEFINE_UNQUOTED(PACKAGE_MAJOR,$PACKAGE_MAJOR)
 AC_DEFINE_UNQUOTED(PACKAGE_MINOR,$PACKAGE_MINOR)
 AC_DEFINE_UNQUOTED(PACKAGE_REVISION,$PACKAGE_REVISION)
+
+AC_CANONICAL_HOST
+AC_MSG_CHECKING(for solaris)
+case "$host" in
+  *solaris*)
+    os_solaris=yes;
+    AC_MSG_RESULT(yes)
+    ;;
+  *)
+    os_solaris=no;
+    AC_MSG_RESULT(no)
+    ;;
+esac
 	 
 if test "$GCC" = "yes"; then
     MKSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
@@ -65,7 +78,12 @@
     DSO_PIC_CFLAGS='-fPIC -DPIC'
 else
     MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-    DSO_LDOPTS='-shared -h $@'
+    if test "$os_solaris" = "yes"; then
+      DSO_LDOPTS='-G -z text -z defs -h $@'
+      LIBS="$LIBS -lc"
+    else
+      DSO_LDOPTS='-shared -h $@'
+    fi
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC -DPIC'
 fi

--- /tmp/tmp/fcpackage.02-06-03.01-31/fontconfig/configure.in	Fri May 24 06:19:30 2002
+++ configure.in	Fri Jun  7 18:17:42 2002
@@ -43,6 +43,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PATH_X
+AC_CANONICAL_HOST
 
 PACKAGE_VERSION=1.0.1
 
@@ -75,6 +76,18 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([memmove memset strchr strrchr strtol getopt getopt_long])
 
+AC_MSG_CHECKING(for solaris)
+case "$host" in
+  *solaris*)
+    os_solaris=yes;
+    AC_MSG_RESULT(yes)
+    ;;
+  *)
+    os_solaris=no;
+    AC_MSG_RESULT(no)
+    ;;
+esac
+
 if test "$GCC" = "yes"; then
     MKSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     DSO_LDOPTS='-shared -Wl,-h,`echo $@ | sed '"'s/\.so\.\([[0-9][0-9]]*\).*/.so.\1/'"'`'
@@ -82,7 +95,12 @@
     DSO_PIC_CFLAGS='-fPIC -DPIC'
 else
     MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-    DSO_LDOPTS='-shared -h $@'
+    if test "$os_solaris" = "yes"; then
+      DSO_LDOPTS='-G -z text -z defs -h $@'
+      LIBS="$LIBS -lc"
+    else
+      DSO_LDOPTS='-shared -h $@'
+    fi
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC -DPIC'
 fi