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

fill in MODGNU_CONFIG_GUESS_DIRS accordingly and sync libtool patch to repair on ppc; ok maintainer

Browse Source
This commit is contained in:
pvalchev 2001-09-26 03:08:12 +00:00
parent 45efd8ceb2
commit f933993ed1
2 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/ORBit/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2001/06/27 14:54:53 brad Exp $
# $OpenBSD: Makefile,v 1.26 2001/09/26 03:08:12 pvalchev Exp $
COMMENT= "high-performance CORBA ORB with support for the C language"
DISTNAME= ORBit-0.5.8
CATEGORIES= devel
NEED_VERSION= 1.413
NEED_VERSION= 1.460
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
@ -27,6 +27,8 @@ CONFIGURE_ARGS+= --enable-static --disable-indent
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/popt ${WRKSRC}/libIDL
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/orbit
${INSTALL_DATA} ${FILESDIR}/orbitrc-sample \

69
devel/ORBit/patches/patch-ltconfig
View File

@ -1,17 +1,34 @@
$OpenBSD: patch-ltconfig,v 1.3 2001/03/08 15:01:16 brad Exp $
--- ltconfig.orig Tue Jan 30 17:50:17 2001
+++ ltconfig Tue Mar 6 23:08:49 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
$OpenBSD: patch-ltconfig,v 1.4 2001/09/26 03:08:12 pvalchev Exp $
--- ltconfig.orig Sun May 13 01:12:26 2001
+++ ltconfig Mon Sep 24 18:34:15 2001
@@ -501,7 +501,14 @@
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@ else
ld_shlibs=yes
@@ -1402,10 +1411,21 @@
;;
openbsd*)
@ -21,32 +38,44 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/03/08 15:01:16 brad Exp $
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2035,10 @@ netbsd*)
@@ -2021,9 +2041,23 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)