diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-10-16 22:21:34 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-10-16 22:21:34 +0000 |
| commit | f42b26e9a9e320edd91b2a78aacd8385602f57de (patch) | |
| tree | 901019900a4c38335e3a344130c24d15c307b7de /gnu | |
| parent | eca9fd404935792424c879be58e56f41859cc26d (diff) | |
- use shlib_version for major/minor lib revs
- take CC/CXX into consideration with autoconf
- put libtool_VERSION in configure back to the
stock value (same as configure.in)
ok millert@ drahn@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libstdc++/Makefile.bsd-wrapper | 12 | ||||
| -rwxr-xr-x | gnu/lib/libstdc++/libstdc++/configure | 2 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/src/Makefile.am | 2 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/src/Makefile.in | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gnu/lib/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libstdc++/Makefile.bsd-wrapper index b12fb2d5226..407e6bd9f72 100644 --- a/gnu/lib/libstdc++/Makefile.bsd-wrapper +++ b/gnu/lib/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,8 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2004/03/19 16:16:55 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2004/10/16 22:21:33 brad Exp $ + +.include "${.CURDIR}/shlib_version" +SHLIB_MAJOR=${major} +SHLIB_MINOR=${minor} LIBIBERTY_INCLUDES=${.CURDIR}/../libiberty/include LIBIBERTY_SRCDIR=${.CURDIR}/../libiberty/src @@ -9,7 +13,8 @@ GXX_INCDIR= /usr/include/g++ MAKE_FLAGS= GCC_SRCDIR="${GCC_SRCDIR}" \ LIBIBERTY_INCLUDES="${LIBIBERTY_INCLUDES}" \ LIBIBERTY_SRCDIR="${LIBIBERTY_SRCDIR}" \ - mkinstalldirs='mkdir -p' + mkinstalldirs='mkdir -p' \ + libtool_VERSION=${SHLIB_MAJOR}:${SHLIB_MINOR}:0 .MAIN: all @@ -42,7 +47,8 @@ CF_SHARED= --enable-shared config.status: PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ - CFLAGS="${CFLAGS} ${COPTS}" CXXFLAGS="${CXXFLAGS} ${COPTS}" \ + CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${COPTS}" \ + CXXFLAGS="${CXXFLAGS} ${COPTS}" \ /bin/sh ${.CURDIR}/libstdc++/configure \ --prefix=/usr \ --disable-nls \ diff --git a/gnu/lib/libstdc++/libstdc++/configure b/gnu/lib/libstdc++/libstdc++/configure index de6db78687f..16caf26f730 100755 --- a/gnu/lib/libstdc++/libstdc++/configure +++ b/gnu/lib/libstdc++/libstdc++/configure @@ -591,7 +591,7 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD PACKAGE=libstdc++ # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=32:0:0 +libtool_VERSION=5:5:0 diff --git a/gnu/lib/libstdc++/libstdc++/src/Makefile.am b/gnu/lib/libstdc++/libstdc++/src/Makefile.am index 199bb65521f..26c9da096e4 100644 --- a/gnu/lib/libstdc++/libstdc++/src/Makefile.am +++ b/gnu/lib/libstdc++/libstdc++/src/Makefile.am @@ -160,7 +160,7 @@ libstdc___la_LIBADD = \ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ - -version-info @libtool_VERSION@ ${version_arg} \ + -version-info ${libtool_VERSION} ${version_arg} \ -lm @LIBUNWIND_FLAG@ diff --git a/gnu/lib/libstdc++/libstdc++/src/Makefile.in b/gnu/lib/libstdc++/libstdc++/src/Makefile.in index 50aa12541f0..1fafe2e4102 100644 --- a/gnu/lib/libstdc++/libstdc++/src/Makefile.in +++ b/gnu/lib/libstdc++/libstdc++/src/Makefile.in @@ -245,7 +245,7 @@ libstdc___la_LIBADD = \ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ - -version-info @libtool_VERSION@ ${version_arg} \ + -version-info ${libtool_VERSION} ${version_arg} \ -lm @LIBUNWIND_FLAG@ |