cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- unbreak after recent libtool update

Browse Source 
from brad
This commit is contained in:
jasper 2011-09-22 21:15:30 +00:00
parent d178e429e3
commit 8bc2721574
13 changed files with 1306 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lang/kaffe/Makefile
View File

@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.53 2011/09/16 10:31:21 espie Exp $
# $OpenBSD: Makefile,v 1.54 2011/09/22 21:15:30 jasper Exp $
ONLY_FOR_ARCHS= amd64 i386 powerpc
COMMENT-main= kaffe.org's Java JDK1.4 compiler, runtime and libs
DISTNAME= kaffe-1.1.7
REVISION-main= 12
VER= 1.1.7
DISTNAME= kaffe-${VER}
PKGNAME-main= kaffe-${VER}
REVISION-main= 13
CATEGORIES= lang
@ -24,8 +26,6 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext
# libtool needs to support -dlopen option
USE_LIBTOOL= gnu
USE_GMAKE= Yes
USE_GROFF= Yes
@ -34,24 +34,26 @@ BUILD_DEPENDS= archivers/zip \
LIB_DEPENDS= x11/gtk+2 \
devel/gmp \
devel/libaudiofile \
audio/esound \
devel/libtool,-ltdl
audio/esound
RUN_DEPENDS= archivers/zip \
lang/jikes>=1.22p0
WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 c cairo
WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 gdk_pixbuf-2.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio xcb z
WANTLIB += gdk-x11-2.0 gtk-x11-2.0 gmp audiofile esd ltdl
WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xtst audiofile c cairo esd
WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gmp gtk-x11-2.0 m pcre pixman-1 png pthread pthread-stubs
WANTLIB += sndio xcb xcb-render xcb-shm z
SEPARATE_BUILD= concurrent
MULTI_PACKAGES= -main
PREFIX= ${LOCALBASE}/kaffe
PREFIX-main= ${LOCALBASE}
MAKE_ENV+= ${_lt_libs}
MAKE_FLAGS+= ${_lt_libs}
CONFIGURE_STYLE=gnu
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}
SUBST_VARS= GNU_ARCH
@ -60,12 +62,11 @@ MODGNU_CONFIG_GUESS_DIRS= \
${WRKSRC}/libraries/javalib/external/classpath \
${WRKSRC}/external/gcc/fastjar
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= \
--with-iconv-prefix=${LOCALBASE} \
--disable-boehm-gc-configuration \
CONFIGURE_ARGS+= --disable-boehm-gc-configuration \
--enable-static \
--with-engine=intrp
post-install:

27
lang/kaffe/patches/patch-Makefile_in
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2006/04/11 01:09:44 kurt Exp $
--- Makefile.in.orig Tue Mar 28 15:53:14 2006
+++ Makefile.in Tue Mar 28 15:53:25 2006
@@ -388,7 +388,6 @@ SUBDIRS = \
external \
libraries/javalib \
config \
- libltdl \
kaffe/kaffeh \
include \
kaffe/kaffevm \
@@ -402,7 +401,6 @@ DIST_SUBDIRS = \
external \
include \
replace \
- libltdl \
kaffe \
libraries \
tools \
@@ -538,7 +536,6 @@ DIRECTORIES_BEFORE_RTJAR = \
config \
include \
replace \
- libltdl \
kaffe/kaffevm \
libraries/clib \
kaffe

101
lang/kaffe/patches/patch-configure
View File

@ -1,30 +1,77 @@
$OpenBSD: patch-configure,v 1.2 2006/04/11 01:09:44 kurt Exp $
$OpenBSD: patch-configure,v 1.3 2011/09/22 21:15:31 jasper Exp $
--- configure.orig Sun Mar 26 19:43:16 2006
+++ configure Tue Mar 28 16:50:28 2006
@@ -492,7 +492,6 @@ ac_includes_default="\
ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
ac_subdirs_all="$ac_subdirs_all external/gcc/fastjar"
-ac_subdirs_all="$ac_subdirs_all libltdl"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE LIBOBJS GETOPT_H REPLACE_GETOPT_TRUE REPLACE_GETOPT_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS MKTEMP JASMIN HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH kaffe_builddir FASTJAR toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
+++ configure Wed Sep 21 01:26:39 2011
@@ -8876,6 +8876,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_direct=no
+ hardcode_direct_absolute=no
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
link_all_deplibs=unknown
@@ -9623,6 +9624,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
@@ -11792,6 +11794,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct
@@ -5420,8 +5419,8 @@ echo "$as_me: error: this package needs
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
- LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
- LTDLINCL='-I${top_srcdir}/''libltdl'
+ LIBLTDL=-lltdl
+ LTDLINCL=
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
@@ -50681,7 +50680,6 @@ subdirs="$subdirs external/gcc/fastjar"
-subdirs="$subdirs libltdl"
ac_config_headers="$ac_config_headers config/config.h"
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L
@@ -11958,6 +11966,7 @@ always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
@@ -12848,6 +12857,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -14828,6 +14838,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L_CXX
@@ -14924,6 +14940,7 @@ always_export_symbols_F77=no
archive_expsym_cmds_F77=
export_dynamic_flag_spec_F77=
hardcode_direct_F77=no
+hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
@@ -15443,6 +15460,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
hardcode_direct_F77=no
+ hardcode_direct_absolute_F77=no
hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported
link_all_deplibs_F77=unknown

77
lang/kaffe/patches/patch-external_gcc_fastjar_configure Normal file
View File

@ -0,0 +1,77 @@
$OpenBSD: patch-external_gcc_fastjar_configure,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- external/gcc/fastjar/configure.orig Sun Mar 26 19:43:50 2006
+++ external/gcc/fastjar/configure Wed Sep 21 01:29:39 2011
@@ -7014,6 +7014,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_direct=no
+ hardcode_direct_absolute=no
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
link_all_deplibs=unknown
@@ -7761,6 +7762,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
@@ -9930,6 +9932,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L
@@ -10096,6 +10104,7 @@ always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
@@ -10986,6 +10995,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -12962,6 +12972,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L_CXX
@@ -13058,6 +13074,7 @@ always_export_symbols_F77=no
archive_expsym_cmds_F77=
export_dynamic_flag_spec_F77=
hardcode_direct_F77=no
+hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
@@ -13577,6 +13594,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
hardcode_direct_F77=no
+ hardcode_direct_absolute_F77=no
hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported
link_all_deplibs_F77=unknown

10
lang/kaffe/patches/patch-external_gcc_fastjar_jartool_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-external_gcc_fastjar_jartool_c,v 1.2 2006/04/20 04:42:38 kurt Exp $
$OpenBSD: patch-external_gcc_fastjar_jartool_c,v 1.3 2011/09/22 21:15:31 jasper Exp $
--- external/gcc/fastjar/jartool.c.orig Tue Jan 3 10:27:01 2006
+++ external/gcc/fastjar/jartool.c Fri Apr 14 01:07:57 2006
+++ external/gcc/fastjar/jartool.c Tue Sep 20 23:59:53 2011
@@ -1591,6 +1591,31 @@ int create_central_header(int fd){
return 0;
}
@ -33,7 +33,7 @@ $OpenBSD: patch-external_gcc_fastjar_jartool_c,v 1.2 2006/04/20 04:42:38 kurt Ex
int extract_jar(int fd, char **files, int file_num){
int rdamt;
int out_a, in_a;
@@ -1699,6 +1724,13 @@ int extract_jar(int fd, char **files, in
@@ -1699,6 +1724,13 @@ int extract_jar(int fd, char **files, int file_num){
pb_read(&pbf, filename, fnlen);
filename[fnlen] = '\0';
@ -47,7 +47,7 @@ $OpenBSD: patch-external_gcc_fastjar_jartool_c,v 1.2 2006/04/20 04:42:38 kurt Ex
#ifdef DEBUG
printf("filename is %s\n", filename);
#endif
@@ -1706,11 +1738,13 @@ int extract_jar(int fd, char **files, in
@@ -1706,11 +1738,13 @@ int extract_jar(int fd, char **files, int file_num){
if(file_num > 0){
handle = FALSE;
@ -63,7 +63,7 @@ $OpenBSD: patch-external_gcc_fastjar_jartool_c,v 1.2 2006/04/20 04:42:38 kurt Ex
}
if(!handle)
@@ -2007,17 +2041,25 @@ int list_jar(int fd, char **files, int f
@@ -2007,17 +2041,25 @@ int list_jar(int fd, char **files, int file_num){
}
filename[fnlen] = '\0';

188
lang/kaffe/patches/patch-external_gcc_fastjar_ltmain_sh Normal file
View File

@ -0,0 +1,188 @@
$OpenBSD: patch-external_gcc_fastjar_ltmain_sh,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- external/gcc/fastjar/ltmain.sh.orig Tue Jan 3 10:27:01 2006
+++ external/gcc/fastjar/ltmain.sh Wed Sep 21 01:41:32 2011
@@ -1859,6 +1859,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -2076,20 +2077,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit $EXIT_FAILURE
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2272,7 +2273,7 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ test -z "$DESTDIR" && need_relink=yes
fi
# This is a shared library
@@ -2411,7 +2412,8 @@ EOF
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
@@ -2467,7 +2469,8 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3092,6 +3095,20 @@ EOF
major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if ! test -f ${SHARED_LIBS_LOG}; then
+ echo "# SHARED_LIBS+= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+ fi
+ tmp4=`echo $libname|sed -e 's/^lib//'`
+ printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi
# Check to see if the archive will have undefined symbols.
@@ -5365,6 +5382,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5519,8 +5540,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -5553,8 +5574,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -5589,8 +5610,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -5598,8 +5619,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
@@ -5828,40 +5849,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

188
lang/kaffe/patches/patch-external_gcc_fastjar_scripts_ltmain_sh Normal file
View File

@ -0,0 +1,188 @@
$OpenBSD: patch-external_gcc_fastjar_scripts_ltmain_sh,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- external/gcc/fastjar/scripts/ltmain.sh.orig Sun Jan 8 22:19:30 2006
+++ external/gcc/fastjar/scripts/ltmain.sh Wed Sep 21 01:41:59 2011
@@ -1859,6 +1859,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -2076,20 +2077,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit $EXIT_FAILURE
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2272,7 +2273,7 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ test -z "$DESTDIR" && need_relink=yes
fi
# This is a shared library
@@ -2411,7 +2412,8 @@ EOF
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
@@ -2467,7 +2469,8 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3092,6 +3095,20 @@ EOF
major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if ! test -f ${SHARED_LIBS_LOG}; then
+ echo "# SHARED_LIBS+= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+ fi
+ tmp4=`echo $libname|sed -e 's/^lib//'`
+ printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi
# Check to see if the archive will have undefined symbols.
@@ -5365,6 +5382,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5519,8 +5540,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -5553,8 +5574,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -5589,8 +5610,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -5598,8 +5619,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
@@ -5828,40 +5849,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

77
lang/kaffe/patches/patch-libltdl_configure Normal file
View File

@ -0,0 +1,77 @@
$OpenBSD: patch-libltdl_configure,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- libltdl/configure.orig Wed Sep 21 00:45:21 2011
+++ libltdl/configure Wed Sep 21 01:19:29 2011
@@ -7231,6 +7231,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_direct=no
+ hardcode_direct_absolute=no
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
link_all_deplibs=unknown
@@ -7978,6 +7979,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
@@ -10147,6 +10149,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L
@@ -10313,6 +10321,7 @@ always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
@@ -11203,6 +11212,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -13183,6 +13193,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L_CXX
@@ -13279,6 +13295,7 @@ always_export_symbols_F77=no
archive_expsym_cmds_F77=
export_dynamic_flag_spec_F77=
hardcode_direct_F77=no
+hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
@@ -13798,6 +13815,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
hardcode_direct_F77=no
+ hardcode_direct_absolute_F77=no
hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported
link_all_deplibs_F77=unknown

12
lang/kaffe/patches/patch-libltdl_ltdl_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libltdl_ltdl_c,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- libltdl/ltdl.c.orig Wed Sep 21 00:08:20 2011
+++ libltdl/ltdl.c Wed Sep 21 00:10:41 2011
@@ -3203,7 +3203,7 @@ try_dlopen (phandle, filename)
}
#endif
}
- if (!file)
+ else
{
file = fopen (filename, LT_READTEXT_MODE);
}

196
lang/kaffe/patches/patch-libltdl_ltmain_sh Normal file
View File

@ -0,0 +1,196 @@
$OpenBSD: patch-libltdl_ltmain_sh,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- libltdl/ltmain.sh.orig Sun Jan 29 12:11:09 2006
+++ libltdl/ltmain.sh Wed Sep 21 00:44:17 2011
@@ -1604,6 +1604,7 @@ EOF
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -2100,6 +2101,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
compiler_flags="$compiler_flags $deplib"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -2334,20 +2336,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit $EXIT_FAILURE
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2542,7 +2544,7 @@ EOF
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ test -z "$DESTDIR" && need_relink=yes
fi
# This is a shared library
@@ -2685,7 +2687,8 @@ EOF
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
@@ -2741,7 +2744,8 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3359,6 +3363,20 @@ EOF
major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if ! test -f ${SHARED_LIBS_LOG}; then
+ echo "# SHARED_LIBS+= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+ fi
+ tmp4=`echo $libname|sed -e 's/^lib//'`
+ printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi
# Check to see if the archive will have undefined symbols.
@@ -5797,6 +5815,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5951,8 +5973,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -5997,8 +6019,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6033,8 +6055,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -6042,8 +6064,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
@@ -6257,40 +6279,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;

77
lang/kaffe/patches/patch-libraries_javalib_external_classpath_configure Normal file
View File

@ -0,0 +1,77 @@
$OpenBSD: patch-libraries_javalib_external_classpath_configure,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- libraries/javalib/external/classpath/configure.orig Tue Mar 21 18:07:22 2006
+++ libraries/javalib/external/classpath/configure Wed Sep 21 01:21:04 2011
@@ -7711,6 +7711,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_direct=no
+ hardcode_direct_absolute=no
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
link_all_deplibs=unknown
@@ -8458,6 +8459,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct=yes
hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
@@ -10627,6 +10629,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L
@@ -10793,6 +10801,7 @@ always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
@@ -11683,6 +11692,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
openbsd*)
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -13659,6 +13669,12 @@ hardcode_libdir_separator=$lt_hardcode_libdir_separato
# resulting binary.
hardcode_direct=$hardcode_direct_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# absolute, i.e impossible to change by setting ${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L=$hardcode_minus_L_CXX
@@ -13755,6 +13771,7 @@ always_export_symbols_F77=no
archive_expsym_cmds_F77=
export_dynamic_flag_spec_F77=
hardcode_direct_F77=no
+hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
@@ -14274,6 +14291,7 @@ echo $ECHO_N "checking whether the $compiler linker ($
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
hardcode_direct_F77=no
+ hardcode_direct_absolute_F77=no
hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported
link_all_deplibs_F77=unknown

196
lang/kaffe/patches/patch-libraries_javalib_external_classpath_ltmain_sh Normal file
View File

@ -0,0 +1,196 @@
$OpenBSD: patch-libraries_javalib_external_classpath_ltmain_sh,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- libraries/javalib/external/classpath/ltmain.sh.orig Wed Sep 21 00:19:22 2011
+++ libraries/javalib/external/classpath/ltmain.sh Wed Sep 21 00:41:58 2011
@@ -1604,6 +1604,7 @@ EOF
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -2103,6 +2104,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
compiler_flags="$compiler_flags $deplib"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -2337,20 +2339,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit $EXIT_FAILURE
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2545,7 +2547,7 @@ EOF
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ test -z "$DESTDIR" && need_relink=yes
fi
# This is a shared library
@@ -2688,7 +2690,8 @@ EOF
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
@@ -2744,7 +2747,8 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3367,6 +3371,20 @@ EOF
major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if ! test -f ${SHARED_LIBS_LOG}; then
+ echo "# SHARED_LIBS+= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+ fi
+ tmp4=`echo $libname|sed -e 's/^lib//'`
+ printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi
# Check to see if the archive will have undefined symbols.
@@ -5805,6 +5823,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5959,8 +5981,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -6005,8 +6027,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6041,8 +6063,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -6050,8 +6072,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
@@ -6265,40 +6287,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;

196
lang/kaffe/patches/patch-scripts_ltmain_sh Normal file
View File

@ -0,0 +1,196 @@
$OpenBSD: patch-scripts_ltmain_sh,v 1.1 2011/09/22 21:15:31 jasper Exp $
--- scripts/ltmain.sh.orig Tue Jan 10 10:23:50 2006
+++ scripts/ltmain.sh Wed Sep 21 01:26:52 2011
@@ -1604,6 +1604,7 @@ EOF
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -2103,6 +2104,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
compiler_flags="$compiler_flags $deplib"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
;;
@@ -2337,20 +2339,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit $EXIT_FAILURE
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2545,7 +2547,7 @@ EOF
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ test -z "$DESTDIR" && need_relink=yes
fi
# This is a shared library
@@ -2688,7 +2690,8 @@ EOF
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
@@ -2744,7 +2747,8 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3367,6 +3371,20 @@ EOF
major=
versuffix=
verstring=""
+ else
+ # XXX
+ tmp=`echo $libname|sed -e 's,+,_,g' -e 's,-,_,g' -e 's,\.,_,g'`
+ eval tmp2=\$${tmp}_ltversion
+ if ! test -z "${SHARED_LIBS_LOG}"; then
+ if ! test -f ${SHARED_LIBS_LOG}; then
+ echo "# SHARED_LIBS+= <libname> <obsd version> # <orig version>" >${SHARED_LIBS_LOG}
+ fi
+ tmp4=`echo $libname|sed -e 's/^lib//'`
+ printf "SHARED_LIBS +=\t%-20s %-8s # %s\n" "$tmp4" "$tmp2" "$versuffix" >>${SHARED_LIBS_LOG}
+ fi
+ if test -n "$versuffix" && test -n "$tmp2"; then
+ versuffix=".$tmp2"
+ fi
fi
# Check to see if the archive will have undefined symbols.
@@ -5805,6 +5823,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5959,8 +5981,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -6005,8 +6027,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6041,8 +6063,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -6050,8 +6072,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
@@ -6265,40 +6287,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
;;