Re: cpp moves to /usr/bin: ports (3/3)
Christian Weisgerber <[email protected]>
| Newsgroups | gmane.os.openbsd.tech |
|---|---|
| Message-ID | <[email protected]> |
Only the imake configuration and the samba port need to be tweaked
for the move of /usr/libexec/cpp to /usr/bin/cpp. I ran a full
amd64 bulk build with this.
diffstat refs/heads/master refs/heads/cpp
M devel/imake-cf/Makefile | 1+ 0-
M devel/imake-cf/patches/patch-OpenBSD_cf | 9+ 0-
M net/samba/Makefile | 0+ 1-
3 files changed, 10 insertions(+), 1 deletion(-)
diff refs/heads/master refs/heads/cpp
commit - b02a26162aba89a932de9beabad71bd4913a9db8
commit + 8937f0af4fa6b5167884c5cb66f976766b755251
blob - 9197d8e606b982621e6973f8b5f8779833be503d
blob + 6c14b8733af2770bf20280a5a8abd249b9c92e2a
--- devel/imake-cf/Makefile
+++ devel/imake-cf/Makefile
@@ -4,6 +4,7 @@ CATEGORIES = devel x11
V = 1.0.8
DISTNAME = xorg-cf-files-${V}
PKGNAME = imake-cf-${V}
+REVISION = 0
SITES = ${SITE_XORG:=util/}
PERMIT_PACKAGE = Yes
blob - a69f3e4356c20bd8910e8cbd3bba16f14fab3fa3
blob + 0aa313edfe24cd9f982267892e39a1fa386f40c5
--- devel/imake-cf/patches/patch-OpenBSD_cf
+++ devel/imake-cf/patches/patch-OpenBSD_cf
@@ -41,6 +41,15 @@ Index: OpenBSD.cf
#define UseGnuMalloc NO
+@@ -162,7 +165,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+ #define MkdirHierCmd mkdir -p
+
+ #ifndef CppCmd
+-#define CppCmd /usr/libexec/cpp
++#define CppCmd cpp
+ #endif
+ #define StandardCppOptions -traditional
+ #define StandardCppDefines /**/
@@ -172,6 +175,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#ifndef CcCmd
#define CcCmd cc
blob - d69ea3d059e7ea555e00987dec0599b39280dd1a
blob + 8fa1a479ebe5502150fe4db1b003f78798a80749
--- net/samba/Makefile
+++ net/samba/Makefile
@@ -134,7 +134,6 @@ WAF_ARGS = -v -j ${MAKE_JOBS}
CONFIGURE_ENV = LC_ALL=en_US.UTF-8 \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- CPP="/usr/libexec/cpp" \
CPPFLAGS="-I${LOCALBASE}/include/inotify -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/inotify -Wl,-rpath,${LOCALBASE}/lib/inotify -L${LOCALBASE}/lib ${LDFLAGS}"
--
Christian "naddy" Weisgerber [email protected]