Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jul 2021 22:31:36 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cb29de57bb52 - main - x11-wm/enlightenment: fix packaging on powerpc
Message-ID:  <202107112231.16BMVale031055@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb29de57bb5211e526958256b7f8ec883425e4c4

commit cb29de57bb5211e526958256b7f8ec883425e4c4
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-07-11 22:31:22 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-07-11 22:31:22 +0000

    x11-wm/enlightenment: fix packaging on powerpc
---
 x11-wm/enlightenment/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index e65183e1c12a..3f101530befb 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -16,7 +16,8 @@ LIB_DEPENDS=	libefl.so:devel/efl \
 		libpulse.so:audio/pulseaudio
 
 USES=		compiler:c11 desktop-file-utils gettext-tools gnome \
-		meson ninja iconv libtool pathfix pkgconfig tar:xz xorg
+		localbase:ldflags meson ninja iconv libtool pathfix pkgconfig \
+		tar:xz xorg
 USE_XORG=	xcb
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -25,8 +26,6 @@ MESON_ARGS=	-Dsystemd=false -Ddevice-udev=false \
 		-Dmount-udisks=false -Dmount-eeze=false -Dbluez5=false \
 		-Dconnman=false --sysconfdir=/usr/local/etc
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		NLS
@@ -46,10 +45,14 @@ ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-x86
 .if ${CURRENT_ARCH:Mpowerpc64*}
 ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-ppc64
 .else
+.if ${CURRENT_ARCH} == powerpc
+ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-ppc
+.else
 ENLIGHTENMENT_ARCH=     ${OPSYS:tl}-${CURRENT_ARCH}
 .endif
 .endif
 .endif
+.endif
 
 ENLIGHTENMENT_VERSION=	0.24.2
 PLIST_SUB=              ENLIGHTENMENT_ARCH=${ENLIGHTENMENT_ARCH}-${ENLIGHTENMENT_VERSION}



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