USE_LIBTOOL and get rid of expensive SUBST_CMD, pointed out by and based by diff from steven@

OK steven@
This commit is contained in:
sebastia 2010-07-29 06:31:15 +00:00
parent fcc3b09a49
commit 448a35d65a
2 changed files with 6 additions and 15 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/07/28 14:20:50 sebastia Exp $
# $OpenBSD: Makefile,v 1.2 2010/07/29 06:31:15 sebastia Exp $
COMMENT = extensible C++ library for XMPP clients and components
REVISION = 0
DISTNAME = gloox-1.0
SHARED_LIBS = gloox 0.0
CATEGORIES = net devel
@ -17,19 +18,18 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MODULES = gcc3
MODULES = devel/gettext gcc3
MODGCC3_ARCHES = sparc
MODGCC3_LANGS = c++
WANTLIB = idn m stdc++ ssl crypto z
LIB_DEPENDS = ::devel/libidn
USE_GMAKE = Yes
USE_LIBTOOL = Yes
SEPARATE_BUILD = simple
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-openssl --with-zlib --with-libidn=${LOCALBASE} \
--without-gnutls
SUBST_VARS = MAKE_PROGRAM
MAKE_ENV = MAKE_PROGRAM=${MAKE_PROGRAM}
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/Makefile.in ${WRKSRC}/Makefile.in
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/07/28 14:20:50 sebastia Exp $
$OpenBSD: patch-src_Makefile_in,v 1.2 2010/07/29 06:31:15 sebastia Exp $
Do not use the hardcoded make
Get rid of GCC parameters that gcc-2.95 does not know of
@ -17,15 +17,6 @@ Get rid of GCC parameters that gcc-2.95 does not know of
lib_LTLIBRARIES = libgloox.la
libgloox_la_SOURCES = jid.cpp parser.cpp connectiontcpclient.cpp clientbase.cpp tag.cpp stanza.cpp logsink.cpp \
@@ -315,7 +315,7 @@ libgloox_la_SOURCES = jid.cpp parser.cpp connectiontcp
tlsopensslserver.cpp compressiondefault.cpp \
connectiontlsserver.cpp
-libgloox_la_LDFLAGS = -version-info 8:0:0 -no-undefined -no-allow-shlib-undefined
+libgloox_la_LDFLAGS = -version-info 0:0:0 -no-undefined -no-allow-shlib-undefined
libgloox_la_LIBADD =
libgloox_la_CFLAGS = $(CPPFLAGS)
libglooxincludedir = $(includedir)/gloox
@@ -914,12 +914,12 @@ uninstall-am: uninstall-libLTLIBRARIES \