From 64e7b22bc6b4a172357d90a728aa61921c859e47 Mon Sep 17 00:00:00 2001 From: khorben Date: Sun, 23 Aug 2015 16:22:38 +0000 Subject: Fix build with clang and support for setting CFLAGS --- x11/deforaos-libdesktop/Makefile | 3 ++- x11/deforaos-libdesktop/distinfo | 3 ++- x11/deforaos-libdesktop/patches/patch-src_Makefile | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 x11/deforaos-libdesktop/patches/patch-src_Makefile (limited to 'x11') diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile index ee21337338e..bc5a1f1ddac 100644 --- a/x11/deforaos-libdesktop/Makefile +++ b/x11/deforaos-libdesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/08/15 16:29:40 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2015/08/23 16:22:38 khorben Exp $ # DISTNAME= libDesktop-0.2.0 @@ -16,6 +16,7 @@ USE_TOOLS+= pkg-config MAKE_FLAGS+= DESTDIR=${DESTDIR} MAKE_FLAGS+= PREFIX=${PREFIX} +MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} .include "../../devel/deforaos-libsystem/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.20 diff --git a/x11/deforaos-libdesktop/distinfo b/x11/deforaos-libdesktop/distinfo index 49d57848f20..718496b22ee 100644 --- a/x11/deforaos-libdesktop/distinfo +++ b/x11/deforaos-libdesktop/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/05/25 17:52:37 khorben Exp $ +$NetBSD: distinfo,v 1.6 2015/08/23 16:22:38 khorben Exp $ SHA1 (libDesktop-0.2.0.tar.gz) = 5915629202ea0e9ae9b2c6929644fab3570802df RMD160 (libDesktop-0.2.0.tar.gz) = 60f6fbee77bdb7524d0908db24ff21ea170f82a3 Size (libDesktop-0.2.0.tar.gz) = 17698 bytes +SHA1 (patch-src_Makefile) = a1ea52cb9da648eb0829ac02296b14d331a23f4e diff --git a/x11/deforaos-libdesktop/patches/patch-src_Makefile b/x11/deforaos-libdesktop/patches/patch-src_Makefile new file mode 100644 index 00000000000..06a8f73c61e --- /dev/null +++ b/x11/deforaos-libdesktop/patches/patch-src_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-src_Makefile,v 1.1 2015/08/23 16:22:38 khorben Exp $ + +Force building with -fPIC by default + +--- src/Makefile.orig 2015-05-25 16:43:44.000000000 +0000 ++++ src/Makefile +@@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib + CC = cc + CPPFLAGSF= -I ../include + CPPFLAGS= +-CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0` +-CFLAGS = -Wall -g -O2 -fPIC -pedantic ++CFLAGSF = `pkg-config --cflags libSystem gtk+-2.0` -fPIC ++CFLAGS = -W -Wall -g -O2 -pedantic + LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` + AR = ar + RANLIB = ranlib -- cgit v1.2.3