Skip to content

Commit cda3dbf

Browse files
committed
unicon: use CXXFLAGS not CFLAGS when bulding C++
1 parent 9827493 commit cda3dbf

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

lang/unicon/Portfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ depends_lib-append port:libogg \
3131
port:xorg-libX11 \
3232
port:zlib
3333

34-
patch.pre_args-replace -p0 -p1
35-
patchfiles implicit.patch
34+
patchfiles implicit.patch \
35+
CXXFLAGS.patch
3636

37+
configure.args --enable-verbosebuild
3738
# Linker fails without explicitly providing OpenSSL this way even
3839
# though the openssl PG setup is detected during configure phase
3940
configure.libs-append -L[openssl::lib_dir]

lang/unicon/files/CXXFLAGS.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Use CXXFLAGS when building C++. Fixed upstream in
2+
<https://github.com/uniconproject/unicon/commit/adc981124123da5bc42b22a96fbe1c3c195031b5>.
3+
4+
--- src/common/Makefile.orig 2020-12-21 16:08:43
5+
+++ src/common/Makefile 2026-03-27 11:24:34
6+
@@ -89,7 +89,7 @@
7+
drawstring3d.$(O): drawstring3d.cc
8+
@if test "`which $(CXX)`" != "" ; then \
9+
echo "Got C++, building drawstring3d.o"; \
10+
- $(CXX) -c $(CPPFLAGS) $(CFLAGS) -I/usr/include/freetype2 -I/opt/X11/include/freetype2 -o drawstring3d.o drawstring3d.cc; \
11+
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -I/usr/include/freetype2 -I/opt/X11/include/freetype2 -o drawstring3d.o drawstring3d.cc; \
12+
else \
13+
echo "No C++, too bad"; \
14+
echo "extern void syserr(char*); int cpp_drawstring3d(double x, double y, double z, char *s, char *f, int t, int size, void **tfont) { syserr(\"no C++; it is required for 3d fonts\"); return -1; } " > drawstring3d.c ; \

lang/unicon/files/implicit.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Fix:
33
error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Wimplicit-function-declaration]
44

55
diff -urN a/configure b/configure
6-
--- a/configure 2020-12-21 00:08:43.000000000 -0500
7-
+++ b/configure 2026-03-23 00:58:22.654500274 -0400
6+
--- configure.orig 2020-12-21 00:08:43.000000000 -0500
7+
+++ configure 2026-03-23 00:58:22.654500274 -0400
88
@@ -13805,7 +13805,7 @@
99

1010
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

0 commit comments

Comments
 (0)