diff options
Diffstat (limited to 'japanese/libslang/files/patch-aa')
| -rw-r--r-- | japanese/libslang/files/patch-aa | 86 |
1 files changed, 41 insertions, 45 deletions
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa index cad6178d2955..f58a3046be8e 100644 --- a/japanese/libslang/files/patch-aa +++ b/japanese/libslang/files/patch-aa @@ -1,33 +1,59 @@ ---- configure.orig Sun Feb 10 16:39:19 2002 -+++ configure Mon Feb 25 01:10:52 2002 -@@ -2032,6 +2032,26 @@ +--- configure.orig Thu Feb 21 20:10:02 2002 ++++ configure Tue May 7 00:40:04 2002 +@@ -1832,8 +1832,8 @@ + #define HAVE_DLFCN_H 1 + EOF + +- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:1837: checking for dlopen in -ldl" >&5 ++ echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ++echo "configure:1837: checking for dlopen" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1868,7 +1868,7 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +- DYNAMIC_LINK_LIB="-ldl" ++ DYNAMIC_LINK_LIB="" + cat >> confdefs.h <<\EOF + #define HAVE_DLOPEN 1 + EOF +@@ -1943,7 +1943,11 @@ + + ELFLIB="lib\$(THIS_LIB).so" + ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)" +-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)" ++if test $PORTOBJFORMAT = elf; then ++ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)" ++else ++ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)" ++fi + + case "$host_os" in + *linux* ) +@@ -2032,6 +2036,19 @@ ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib" ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib" ;; + *freebsd* ) -+ if [ "$PORTOBJFORMAT" = elf ]; then -+ DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" ++ if [ $PORTOBJFORMAT = elf ]; then + ELF_CC="\$(CC)" + ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ ELF_LINK="\$(CC) -shared -Wl,-soname#" -+ ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)" -+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" -+ CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" ++ ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)" ++ ELF_LINK_CMD="\$(ELF_LINK)" + else -+ # aout format is not tested -+ DYNAMIC_LINK_FLAGS="" + ELF_CC="\$(CC)" -+ ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC" ++ ELF_CFLAGS="\$(CFLAGS) -fPIC" + ELF_LINK="ld -Bshareable -x" + ELF_LINK_CMD="\$(ELF_LINK)" -+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" -+ CC_SHARED="\$(CC) \$(CFLAGS) -fpic -DPIC" + fi + ;; * ) echo "Note: ELF compiler for host_os=$host_os may be wrong" ELF_CC="$CC" -@@ -2432,16 +2452,16 @@ +@@ -2432,16 +2449,8 @@ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 echo "configure:2435: checking SLANG_VERSION" >&5 @@ -41,38 +67,8 @@ - awk '{ print ($1 - $2*10000 - $3*100) }'` - -slang_minor_version="$slang_minor_version.$slang_mminor_version" -+#slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | -+# awk '{ print $3 }'` -+#slang_major_version=`echo $slang_version | -+# awk '{ print int($1/10000) }'` -+#slang_minor_version=`echo $slang_version $slang_major_version | -+# awk '{ print int(($1 - $2*10000)/100) }'` -+#slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | -+# awk '{ print ($1 - $2*10000 - $3*100) }'` +slang_major_version=2 +slang_minor_version=5 slang_version="$slang_major_version.$slang_minor_version" echo "$ac_t""$slang_version" 1>&6 -@@ -2970,21 +2990,3 @@ - - - echo "" --echo "Configuration complete. You may need to edit src/Makefile." --echo "You are compiling SLANG with the following compiler configuration:" --echo " CC =" "$CC" --echo " CFLAGS =" "$CFLAGS" --echo " LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS" --echo "" --echo " ELF_CC =" "$ELF_CC" --echo " ELF_LINK =" "$ELF_LINK" --echo "ELF_CFLAGS=" "$ELF_CFLAGS" --echo "" --echo " prefix:" "$prefix" --echo " exec_prefix:" "$exec_prefix" --echo " Installation Lib Dir:" "$libdir" --echo "Installation Include Dir:" "$includedir" --echo "" --echo "See also src/sl-feat.h for various features." --echo "Type 'make' to build normal library." --echo "On ELF systems, type 'make elf' to create ELF shared library." |