aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2004-05-11 15:17:15 +0800
committervs <vs@FreeBSD.org>2004-05-11 15:17:15 +0800
commit726a027e78ba66370312299e73629efab25dbcc4 (patch)
treef0b74551c0bbe6695c744b76743d510d5fdf68af
parent1b0d13a102716b49686cec4cedba50a818e5764c (diff)
downloadfreebsd-ports-gnome-726a027e78ba66370312299e73629efab25dbcc4.tar.gz
freebsd-ports-gnome-726a027e78ba66370312299e73629efab25dbcc4.tar.zst
freebsd-ports-gnome-726a027e78ba66370312299e73629efab25dbcc4.zip
- Fix pthread-issue on -STABLE
- Try to pass {C,LD}FLAGS through Requested by: kris
-rw-r--r--textproc/iiimf-client-lib/Makefile3
-rw-r--r--textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in17
2 files changed, 19 insertions, 1 deletions
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 035f31a02d40..35ac2ce63732 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
+CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_FLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--includedir=${PREFIX}/include/iiimf
DIRS= lib/EIMIL lib/iiimcf
@@ -42,7 +43,7 @@ post-patch:
do-configure:
.for DIR in ${DIRS}
- cd ${WRKSRC}/${DIR} && ${SH} configure ${CONFIGURE_ARGS}
+ cd ${WRKSRC}/${DIR} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}
.endfor
do-build:
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in
new file mode 100644
index 000000000000..5240be6477c1
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in
@@ -0,0 +1,17 @@
+--- lib/EIMIL/test/Makefile.in.orig Tue May 11 08:33:21 2004
++++ lib/EIMIL/test/Makefile.in Tue May 11 08:33:59 2004
+@@ -162,12 +162,12 @@
+ @AMDEP_TRUE@ ./$(DEPDIR)/flowtest-flowtest.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/parsertest-parsertest.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(THREAD_CXX_FLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++ $(AM_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) -o $@
+ DIST_SOURCES = $(arithtest_SOURCES) $(flowtest_SOURCES) \
+ $(parsertest_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in