Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Mar 2019 02:15:50 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495008 - in head/sysutils/conky: . files
Message-ID:  <201903080215.x282FoT7033759@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Mar  8 02:15:50 2019
New Revision: 495008
URL: https://svnweb.freebsd.org/changeset/ports/495008

Log:
  Fix build on non-x86 archs by disabling apm.
  
  Approved by:	portmgr (tier-2 blanket)

Added:
  head/sysutils/conky/files/extra-patch-src_CMakeLists.txt   (contents, props changed)
Modified:
  head/sysutils/conky/Makefile

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Fri Mar  8 00:40:58 2019	(r495007)
+++ head/sysutils/conky/Makefile	Fri Mar  8 02:15:50 2019	(r495008)
@@ -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/' \

Added: head/sysutils/conky/files/extra-patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/conky/files/extra-patch-src_CMakeLists.txt	Fri Mar  8 02:15:50 2019	(r495008)
@@ -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)
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903080215.x282FoT7033759>