pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/converters/php-iconv
Module Name: pkgsrc
Committed By: adam
Date: Wed Sep 25 07:30:54 UTC 2024
Modified Files:
pkgsrc/converters/php-iconv: Makefile
Log Message:
php-iconv: allow building on Darwin without Command Line Tools
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/converters/php-iconv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/converters/php-iconv/Makefile
diff -u pkgsrc/converters/php-iconv/Makefile:1.13 pkgsrc/converters/php-iconv/Makefile:1.14
--- pkgsrc/converters/php-iconv/Makefile:1.13 Fri Jan 5 03:14:52 2018
+++ pkgsrc/converters/php-iconv/Makefile Wed Sep 25 07:30:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/01/05 03:14:52 taca Exp $
+# $NetBSD: Makefile,v 1.14 2024/09/25 07:30:54 adam Exp $
MODNAME= iconv
CATEGORIES+= converters
@@ -20,9 +20,15 @@ CHECK_BUILTIN.iconv:= yes
.include "../../converters/libiconv/builtin.mk"
CHECK_BUILTIN.iconv:= no
-.if !empty(USE_BUILTIN.iconv:M[nN][oO]) || \
- !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_BUILTIN.iconv:U:tl} == no || ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
+# Hack: allow building on Darwin without Command Line Tools.
+. if ${OPSYS} == "Darwin" && ${BUILDLINK_PREFIX.iconv} == "/usr" && !exists(/usr/include/iconv.h)
+CONFIGURE_ARGS+= --with-iconv=shared,${OSX_SDK_PATH:Q}/${BUILDLINK_PREFIX.iconv}
+. else
CONFIGURE_ARGS+= --with-iconv=shared,${BUILDLINK_PREFIX.iconv}
+. endif
.else
CONFIGURE_ARGS+= --with-iconv
.endif
Home |
Main Index |
Thread Index |
Old Index