pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: remove duplicate nss/nss now that devel/nss has changed



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Mar 9 09:19:38 2021 +0100
Changeset:	363f6147a38010caa4ef70da7ce5fcf988d0bab9

Modified Files:
	389-ds-base/Makefile
	chromium/Makefile

Log Message:
*: remove duplicate nss/nss now that devel/nss has changed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=363f6147a38010caa4ef70da7ce5fcf988d0bab9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 389-ds-base/Makefile | 4 ++--
 chromium/Makefile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/389-ds-base/Makefile b/389-ds-base/Makefile
index 78963ff3c6..5f55e55a5b 100644
--- a/389-ds-base/Makefile
+++ b/389-ds-base/Makefile
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=	--with-sasl=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CPPFLAGS+=		-I${BUILDLINK_DIR}/include/nspr
 CFLAGS+=		-I${BUILDLINK_DIR}/include/nspr
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include/nss/nss
-CFLAGS+=		-I${BUILDLINK_DIR}/include/nss/nss
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include/nss
+CFLAGS+=		-I${BUILDLINK_DIR}/include/nss
 CPPFLAGS+=		-I${BUILDLINK_DIR}/include/ldap
 CFLAGS+=		-I${BUILDLINK_DIR}/include/ldap
 
diff --git a/chromium/Makefile b/chromium/Makefile
index bf565471d8..096b51b88d 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -102,7 +102,7 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		icu_use_data_file=false
 GN_ARGS+=	extra_cxxflags="-I${BUILDLINK_DIR}/include \
 			-I${BUILDLINK_DIR}/include/glib \
-			-I${BUILDLINK_DIR}/include/nss/nss" \
+			-I${BUILDLINK_DIR}/include/nss" \
 		extra_ldflags="-L${PREFIX}/lib \
 			-L${X11BASE}/lib \
 			${COMPILER_RPATH_FLAG}${PREFIX}/lib \


Home | Main Index | Thread Index | Old Index