From de51a09deae2b3bc5c2b3eb6e84665e0d50e6165 Mon Sep 17 00:00:00 2001 From: steven Date: Thu, 4 Jan 2007 20:56:43 +0000 Subject: [PATCH] build the shared library properly during build, and avoid rebuilding it during fake. --- textproc/libebml/Makefile | 5 +++-- textproc/libebml/patches/patch-make_linux_Makefile | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/textproc/libebml/Makefile b/textproc/libebml/Makefile index 907c62b572f..115c495a860 100644 --- a/textproc/libebml/Makefile +++ b/textproc/libebml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/01/04 15:52:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2007/01/04 20:56:43 steven Exp $ COMMENT= "Extensible Binary Meta Language library" DISTNAME= libebml-0.7.7 @@ -21,6 +21,7 @@ USE_GMAKE= Yes WRKSRC= ${WRKDIST}/make/linux FAKE_FLAGS+= LIBebml_VERSION=${LIBebml_VERSION} -MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" +MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ + LIBebml_VERSION=${LIBebml_VERSION} .include diff --git a/textproc/libebml/patches/patch-make_linux_Makefile b/textproc/libebml/patches/patch-make_linux_Makefile index dab214168d1..47e8517f69a 100644 --- a/textproc/libebml/patches/patch-make_linux_Makefile +++ b/textproc/libebml/patches/patch-make_linux_Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-make_linux_Makefile,v 1.3 2007/01/04 15:52:07 ajacoutot Exp $ ---- make/linux/Makefile.orig Mon Jan 1 16:36:35 2007 -+++ make/linux/Makefile Mon Jan 1 16:39:27 2007 +$OpenBSD: patch-make_linux_Makefile,v 1.4 2007/01/04 20:56:43 steven Exp $ +--- make/linux/Makefile.orig Thu Mar 30 21:05:11 2006 ++++ make/linux/Makefile Thu Jan 4 21:58:05 2007 @@ -16,11 +16,11 @@ prefix=/boot/home/config else prefix=/usr/local @@ -16,12 +16,14 @@ $OpenBSD: patch-make_linux_Makefile,v 1.3 2007/01/04 15:52:07 ajacoutot Exp $ LD=$(CXX) AR = ar rcvu RANLIB = ranlib -@@ -52,7 +52,7 @@ LIBS= +@@ -51,8 +51,8 @@ LIBS= + # Names LIBRARY=libebml.a - LIBRARY_SO=libebml.so +-LIBRARY_SO=libebml.so -LIBRARY_SO_VER=libebml.so.0 +LIBRARY_SO_VER=libebml.so.${LIBebml_VERSION} ++LIBRARY_SO=${LIBRARY_SO_VER} # source-files sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))