diff options
| author | 0mp <0mp@FreeBSD.org> | 2018-10-01 22:22:37 +0800 |
|---|---|---|
| committer | 0mp <0mp@FreeBSD.org> | 2018-10-01 22:22:37 +0800 |
| commit | 43420b5bfb8d9a376fd35f53470da5bf32a92a06 (patch) | |
| tree | c489e962fe6a2e194864c0368e222752284f140c /sysutils | |
| parent | 7d812d04e2eca4de698e03b2798d29dab53b4bf5 (diff) | |
| download | freebsd-ports-gnome-43420b5bfb8d9a376fd35f53470da5bf32a92a06.tar.gz freebsd-ports-gnome-43420b5bfb8d9a376fd35f53470da5bf32a92a06.tar.zst freebsd-ports-gnome-43420b5bfb8d9a376fd35f53470da5bf32a92a06.zip | |
sysutils/cbsd: Fix build on mips, mips64, powerpc64.
This port unconditionally links against libc++. This needs to be removed
to build on architectures that don't have libc++.
PR: 231789
Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Approved by: olevole@olevole.ru (maintainer), mat (mentor)
Sponsored by: IntegriCloud (hardware)
Differential Revision: https://reviews.freebsd.org/D17352
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/cbsd/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/cbsd/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | sysutils/cbsd/files/patch-bin_cbsdsh_Makefile | 11 | ||||
| -rw-r--r-- | sysutils/cbsd/files/patch-sudoexec_initenv | 11 |
4 files changed, 33 insertions, 4 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index a12728879fdf..e203c0b564a6 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -10,10 +10,6 @@ COMMENT= Yet another FreeBSD Jail and Bhyve Management Utility LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_mips= fails to link: cannot find -lc++ -BROKEN_mips64= fails to link: cannot find -lc++ -BROKEN_powerpc64= fails to link: cannot find -lc++ - RUN_DEPENDS= rsync:net/rsync \ sudo:security/sudo \ sqlite3:databases/sqlite3 \ diff --git a/sysutils/cbsd/files/patch-Makefile b/sysutils/cbsd/files/patch-Makefile new file mode 100644 index 000000000000..4c3e7a129e18 --- /dev/null +++ b/sysutils/cbsd/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2018-09-28 16:15:34 UTC ++++ Makefile +@@ -76,7 +76,7 @@ cbsd: pkg-config-check + #${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli + # ICU? + #${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lpthread -licui18n -licuuc -licudata -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli +- ${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli ++ ${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -o misc/sqlcli && ${STRIP} misc/sqlcli + ${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail + ${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt + ${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip diff --git a/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile b/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile new file mode 100644 index 000000000000..cce045701e5b --- /dev/null +++ b/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile @@ -0,0 +1,11 @@ +--- bin/cbsdsh/Makefile.orig 2018-09-28 16:10:13 UTC ++++ bin/cbsdsh/Makefile +@@ -21,7 +21,7 @@ NOMAN= yes + + DPADD= ${LIBEDIT} ${LIBTERMCAP} + #LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail +-LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm -lc++ ++LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm + + #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib + CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib diff --git a/sysutils/cbsd/files/patch-sudoexec_initenv b/sysutils/cbsd/files/patch-sudoexec_initenv new file mode 100644 index 000000000000..b637af3a1aa9 --- /dev/null +++ b/sysutils/cbsd/files/patch-sudoexec_initenv @@ -0,0 +1,11 @@ +--- sudoexec/initenv.orig 2018-09-28 16:11:43 UTC ++++ sudoexec/initenv +@@ -264,7 +264,7 @@ phase2() + echo "pkg-config must be present on the system to build CBSD from the source. Please install it first: pkg install pkgconf"; + exit 1 + fi +- ${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -lc++ -o ${distdir}/misc/sqlcli ++ ${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -o ${distdir}/misc/sqlcli + fi + installne "-s -o ${cbsduser} -g ${cbsduser} -m 500" ${distdir}/misc/sqlcli ${miscdir}/sqlcli + [ -f ${distdir}/misc/sqlcli ] && /bin/rm -f ${distdir}/misc/sqlcli |