diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2019-03-08 02:15:50 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2019-03-08 02:15:50 +0000 |
| commit | 96b29de686637453202d6560495ee65d1054a3d5 (patch) | |
| tree | 69772b0f00857fee63dd5c97106c216503f579e8 | |
| parent | Add a meta-port for the default version of LLVM. (diff) | |
Fix build on non-x86 archs by disabling apm.
Approved by: portmgr (tier-2 blanket)
Notes
Notes:
svn path=/head/; revision=495008
| -rw-r--r-- | sysutils/conky/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/conky/files/extra-patch-src_CMakeLists.txt | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 90ff1e164998..da9b20e9b997 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -123,6 +123,11 @@ XOAP_USE= gnome=libxml2 PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so .endif +# disable apm on non-x86 archs +.if ${ARCH} != amd64 && ${ARCH} != i386 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt +.endif + post-patch: @${REINPLACE_CMD} -e 's/^#\(set(RELEASE true\)/\1/' \ -e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \ diff --git a/sysutils/conky/files/extra-patch-src_CMakeLists.txt b/sysutils/conky/files/extra-patch-src_CMakeLists.txt new file mode 100644 index 000000000000..f059640294b9 --- /dev/null +++ b/sysutils/conky/files/extra-patch-src_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2019-02-23 02:12:15 UTC ++++ src/CMakeLists.txt +@@ -124,7 +124,7 @@ if(OS_LINUX) + endif(OS_LINUX) + + if(OS_FREEBSD) +- set(freebsd freebsd.cc freebsd.h bsdapm.cc bsdapm.h) ++ set(freebsd freebsd.cc freebsd.h) + set(optional_sources ${optional_sources} ${freebsd}) + endif(OS_FREEBSD) + |