ensure use of the libpopt package instead of the copy included with ORBit.
This commit is contained in:
brad
parent
6fe534d2e5
commit
9cdd620436
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.29 2002/02/24 22:43:59 brad Exp $
|
# $OpenBSD: Makefile,v 1.30 2002/05/12 18:15:14 brad Exp $
|
||||||
|
|
||||||
COMMENT= "high-performance CORBA ORB with support for the C language"
|
COMMENT= "high-performance CORBA ORB with support for the C language"
|
||||||
|
|
||||||
@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
|
|||||||
PERMIT_DISTFILES_FTP= Yes
|
PERMIT_DISTFILES_FTP= Yes
|
||||||
|
|
||||||
USE_GMAKE= Yes
|
USE_GMAKE= Yes
|
||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= autoconf
|
||||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/popt ${WRKSRC}/libIDL
|
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/popt ${WRKSRC}/libIDL
|
||||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||||
CONFIGURE_ARGS+= --enable-static --disable-indent
|
CONFIGURE_ARGS+= --enable-static --disable-indent
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
$OpenBSD: patch-Makefile_in,v 1.1 2001/03/08 15:01:15 brad Exp $
|
$OpenBSD: patch-Makefile_in,v 1.2 2002/05/12 18:15:14 brad Exp $
|
||||||
--- Makefile.in.orig Tue Jan 30 17:55:54 2001
|
--- Makefile.in.orig Mon Jan 7 04:23:48 2002
|
||||||
+++ Makefile.in Tue Mar 6 23:08:49 2001
|
+++ Makefile.in Sun May 12 13:53:14 2002
|
||||||
@@ -95,7 +95,7 @@ pkglibdir = @pkglibdir@
|
@@ -95,7 +95,7 @@ pkglibdir = @pkglibdir@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.3 # required version of automake.
|
AUTOMAKE_OPTIONS = 1.3 # required version of automake.
|
||||||
|
|
||||||
-SUBDIRS = popt libIDL src test
|
-SUBDIRS = popt libIDL src test
|
||||||
+SUBDIRS = popt libIDL src
|
+SUBDIRS = libIDL src
|
||||||
|
|
||||||
bin_SCRIPTS = orbit-config
|
bin_SCRIPTS = orbit-config
|
||||||
|
|
||||||
|
|||||||
@ -1,30 +0,0 @@
|
|||||||
$OpenBSD: patch-configure,v 1.2 2002/02/24 22:43:59 brad Exp $
|
|
||||||
--- configure.orig Mon Jan 7 04:09:58 2002
|
|
||||||
+++ configure Sun Feb 24 16:56:17 2002
|
|
||||||
@@ -3450,7 +3450,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
|
|
||||||
-L*)
|
|
||||||
THEFILE="`echo $I | sed -e 's,^-L,,'`"
|
|
||||||
echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
|
|
||||||
- if test -f $THEFILE/libwrap.so; then
|
|
||||||
+ if test -f $THEFILE/libwrap.so*; then
|
|
||||||
LIB_WRAP=-lwrap
|
|
||||||
echo "Found $THEFILE/libwrap.so" 1>&5
|
|
||||||
break
|
|
||||||
@@ -3485,7 +3485,7 @@ if test -n "$LIBWRAP_PATH"; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIB_NSL=
|
|
||||||
-if test -n "$LIBWRAP_PATH"; then
|
|
||||||
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
|
|
||||||
echo $ac_n "checking whether -lwrap requires -lnsl""... $ac_c" 1>&6
|
|
||||||
echo "configure:3491: checking whether -lwrap requires -lnsl" >&5
|
|
||||||
ORIG_LIBS="$LIBS"
|
|
||||||
@@ -3555,7 +3555,7 @@ else
|
|
||||||
HAVE_HOSTS_ACCESS_TRUE='#'
|
|
||||||
HAVE_HOSTS_ACCESS_FALSE=
|
|
||||||
fi
|
|
||||||
-if test -n "$LIBWRAP_PATH"; then
|
|
||||||
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
|
|
||||||
cat >> confdefs.h <<\EOF
|
|
||||||
#define HAVE_HOSTS_ACCESS 1
|
|
||||||
EOF
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-configure_in,v 1.2 2002/02/24 22:43:59 brad Exp $
|
$OpenBSD: patch-configure_in,v 1.3 2002/05/12 18:15:14 brad Exp $
|
||||||
--- configure.in.orig Mon Jan 7 04:09:28 2002
|
--- configure.in.orig Mon Jan 7 04:09:28 2002
|
||||||
+++ configure.in Sun Feb 24 16:56:17 2002
|
+++ configure.in Sun May 12 13:53:25 2002
|
||||||
@@ -161,7 +161,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
|
@@ -161,7 +161,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
|
||||||
-L*)
|
-L*)
|
||||||
THEFILE="`echo $I | sed -e 's,^-L,,'`"
|
THEFILE="`echo $I | sed -e 's,^-L,,'`"
|
||||||
@ -28,3 +28,11 @@ $OpenBSD: patch-configure_in,v 1.2 2002/02/24 22:43:59 brad Exp $
|
|||||||
AC_DEFINE(HAVE_HOSTS_ACCESS)
|
AC_DEFINE(HAVE_HOSTS_ACCESS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -324,7 +324,6 @@ AC_CHECK_ALIGNOF(CORBA_pointer)
|
||||||
|
CPPFLAGS=$orig_CPPFLAGS
|
||||||
|
|
||||||
|
AC_CONFIG_SUBDIRS(libIDL)
|
||||||
|
-AC_CONFIG_SUBDIRS(popt)
|
||||||
|
|
||||||
|
AC_SUBST(pkglibdir)
|
||||||
|
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-popt_Makefile_in,v 1.1 2001/03/08 15:01:17 brad Exp $
|
|
||||||
--- popt/Makefile.in.orig Tue Mar 6 23:02:03 2001
|
|
||||||
+++ popt/Makefile.in Tue Mar 6 23:05:00 2001
|
|
||||||
@@ -152,7 +152,7 @@ CFLAGS = @CFLAGS@
|
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
||||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
||||||
CCLD = $(CC)
|
|
||||||
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|
||||||
+LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(libdir) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
||||||
HEADERS = $(noinst_HEADERS)
|
|
||||||
|
|
||||||
DIST_COMMON = README ./stamp-h.in COPYING Makefile.am Makefile.in \
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
$OpenBSD: patch-popt_ltconfig,v 1.3 2001/03/08 15:01:18 brad Exp $
|
|
||||||
--- popt/ltconfig.orig Tue Jan 30 17:50:30 2001
|
|
||||||
+++ popt/ltconfig Tue Mar 6 23:08:50 2001
|
|
||||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
|
||||||
with_gnu_ld=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
+openbsd*)
|
|
||||||
+ with_gnu_ld=no
|
|
||||||
+ ;;
|
|
||||||
|
|
||||||
esac
|
|
||||||
|
|
||||||
@@ -1402,10 +1405,21 @@ else
|
|
||||||
;;
|
|
||||||
|
|
||||||
openbsd*)
|
|
||||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
|
||||||
- hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
hardcode_direct=yes
|
|
||||||
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='$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
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
;;
|
|
||||||
|
|
||||||
os2*)
|
|
||||||
@@ -2021,13 +2035,10 @@ netbsd*)
|
|
||||||
|
|
||||||
openbsd*)
|
|
||||||
version_type=sunos
|
|
||||||
- if test "$with_gnu_ld" = yes; then
|
|
||||||
- need_lib_prefix=no
|
|
||||||
- need_version=no
|
|
||||||
- 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*)
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
$OpenBSD: patch-popt_ltmain_sh,v 1.1 2001/03/08 15:01:18 brad Exp $
|
|
||||||
--- popt/ltmain.sh.orig Tue Jan 30 17:50:30 2001
|
|
||||||
+++ popt/ltmain.sh Tue Mar 6 23:08:50 2001
|
|
||||||
@@ -1079,7 +1079,18 @@ compiler."
|
|
||||||
# These systems don't actually have c library (as such)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
+ elif test "$arg" = "-lc_r"; then
|
|
||||||
+ case "$host" in
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc_r directly, use -pthread flag.
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
elif test "$arg" = "-lm"; then
|
|
||||||
case "$host" in
|
|
||||||
*-*-cygwin* | *-*-beos*)
|
|
||||||
@@ -1091,6 +1102,10 @@ compiler."
|
|
||||||
deplibs="$deplibs $arg"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -?thread)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-module)
|
|
||||||
module=yes
|
|
||||||
continue
|
|
||||||
@@ -1799,6 +1814,9 @@ compiler."
|
|
||||||
# rhapsody is a little odd...
|
|
||||||
deplibs="$deplibs -framework System"
|
|
||||||
;;
|
|
||||||
+ *-*-openbsd*)
|
|
||||||
+ # Do not include libc due to us having libc/libc_r.
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
# Add libc to deplibs on all other systems.
|
|
||||||
deplibs="$deplibs -lc"
|
|
||||||
@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
|
|
||||||
# Exit here if they wanted silent mode.
|
|
||||||
test "$show" = : && exit 0
|
|
||||||
|
|
||||||
- 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 \`-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 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
39
devel/ORBit/patches/patch-src_orbit-idl-compiler_Makefile_in
Normal file
39
devel/ORBit/patches/patch-src_orbit-idl-compiler_Makefile_in
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
$OpenBSD: patch-src_orbit-idl-compiler_Makefile_in,v 1.1 2002/05/12 18:15:14 brad Exp $
|
||||||
|
--- src/orbit-idl-compiler/Makefile.in.orig Sun May 12 14:01:47 2002
|
||||||
|
+++ src/orbit-idl-compiler/Makefile.in Sun May 12 14:04:52 2002
|
||||||
|
@@ -99,13 +99,13 @@ bin_PROGRAMS = orbit-idl
|
||||||
|
orbitidlincludedir = $(includedir)/orbit-1.0
|
||||||
|
orbitlibdir = $(libdir)/orbit-idl
|
||||||
|
|
||||||
|
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/popt @GLIB_CFLAGS@ @GMODULE_CFLAGS@ -DORBITLIBDIR="\"$(orbitlibdir)\"" -DDEBUG
|
||||||
|
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I$(top_srcdir) -I$(top_srcdir)/src @GLIB_CFLAGS@ @GMODULE_CFLAGS@ -DORBITLIBDIR="\"$(orbitlibdir)\"" -DDEBUG
|
||||||
|
|
||||||
|
|
||||||
|
-orbit_idl_DEPENDENCIES = $(top_builddir)/libIDL/libIDL.la backends/c/liborbit-c-backend.a $(top_builddir)/popt/libpopt.la
|
||||||
|
+orbit_idl_DEPENDENCIES = $(top_builddir)/libIDL/libIDL.la backends/c/liborbit-c-backend.a $(LOCALBASE)/lib/libpopt.la
|
||||||
|
|
||||||
|
orbit_idl_LDFLAGS =
|
||||||
|
-orbit_idl_LDADD = backends/c/liborbit-c-backend.a $(top_builddir)/libIDL/libIDL.la $(top_builddir)/popt/libpopt.la @GLIB_LIBS@ @GMODULE_LIBS@ -lm
|
||||||
|
+orbit_idl_LDADD = backends/c/liborbit-c-backend.a $(top_builddir)/libIDL/libIDL.la $(LOCALBASE)/lib/libpopt.la @GLIB_LIBS@ @GMODULE_LIBS@ -lm
|
||||||
|
|
||||||
|
|
||||||
|
orbit_idl_SOURCES = orbit-idl-main.c orbit-idl-driver.c orbit-idl-backends.c orbit-idl-passes.c orbit-idl-genmarshal.c orbit-idl-utils.c orbit-idl2.h
|
||||||
|
@@ -358,7 +358,7 @@ orbit-idl-genmarshal.o: orbit-idl-genmar
|
||||||
|
orbit-idl2.h ../../libIDL/IDL.h \
|
||||||
|
../../src/ORBitutil/basic_types.h ../../src/orb/orbit.h
|
||||||
|
orbit-idl-main.o: orbit-idl-main.c ../../config.h ../../libIDL/IDL.h \
|
||||||
|
- ../../popt/popt.h orbit-idl2.h \
|
||||||
|
+ orbit-idl2.h \
|
||||||
|
../../src/ORBitutil/basic_types.h ../../src/orb/orbit.h
|
||||||
|
orbit-idl-passes.o: orbit-idl-passes.c ../../config.h orbit-idl2.h \
|
||||||
|
../../libIDL/IDL.h ../../src/ORBitutil/basic_types.h \
|
||||||
|
@@ -451,9 +451,6 @@ maintainer-clean-generic clean mostlycle
|
||||||
|
|
||||||
|
$(top_builddir)/libIDL/libIDL.la:
|
||||||
|
$(MAKE) -C $(top_builddir)/libIDL libIDL.la
|
||||||
|
-
|
||||||
|
-$(top_builddir)/popt/libpopt.la:
|
||||||
|
- $(MAKE) -C $(top_builddir)/popt libpopt.la
|
||||||
|
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
Loading…
Reference in New Issue
Block a user