aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2013-07-05 16:09:44 +0800
committertijl <tijl@FreeBSD.org>2013-07-05 16:09:44 +0800
commit5997aa8a82202d27920f04ff7ed610bb43a000e8 (patch)
tree193e311774a6a7e2d4ff7e0e5e6ffa360b4ea41a
parent1de9ac7dc3ce918b9950e175c39b21095ea6b659 (diff)
downloadfreebsd-ports-gnome-5997aa8a82202d27920f04ff7ed610bb43a000e8.tar.gz
freebsd-ports-gnome-5997aa8a82202d27920f04ff7ed610bb43a000e8.tar.zst
freebsd-ports-gnome-5997aa8a82202d27920f04ff7ed610bb43a000e8.zip
Fix build with clang (USE_CSTD=gnu89) and respect CFLAGS, CPPFLAGS
and LDFLAGS. Approved by: maintainer timeout (20 days)
-rw-r--r--net/appkonference/Makefile1
-rw-r--r--net/appkonference/files/patch-Makefile27
2 files changed, 28 insertions, 0 deletions
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index ada2540309d6..727a8377fb38 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -16,6 +16,7 @@ COMMENT= High-performance Asterisk voice/video conferencing plugin
BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
+USE_CSTD= gnu89
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/konference
diff --git a/net/appkonference/files/patch-Makefile b/net/appkonference/files/patch-Makefile
index 74ce79b00674..564df45894ea 100644
--- a/net/appkonference/files/patch-Makefile
+++ b/net/appkonference/files/patch-Makefile
@@ -27,3 +27,30 @@
# module release
RELEASE = 2.1
+@@ -86,7 +86,7 @@
+ # compiler flags
+ #
+
+-CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
++CFLAGS += -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
+ #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
+ # PERF: below is 10% faster than -O2 or -O3 alone.
+ #CFLAGS += -O3 -ffast-math -funroll-loops
+@@ -103,7 +103,7 @@
+ # preprocessor flags
+ #
+
+-CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
++CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
+ CPPFLAGS += -DRELEASE=\"$(RELEASE)\"
+ CPPFLAGS += -DASTERISK=$(ASTERISK)
+ CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
+@@ -182,7 +182,7 @@
+ $(OBJS): $(INCS)
+
+ $(TARGET): $(OBJS)
+- $(CC) $(SOLINK) -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)
+
+ install:
+ $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR)