pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnucash-devel: some cleanup



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Feb 20 16:39:02 2018 +0100
Changeset:	14a5c64cb89bc2fe0b40d7e75aa04cab3877265f

Modified Files:
	gnucash-devel/Makefile

Log Message:
gnucash-devel: some cleanup

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=14a5c64cb89bc2fe0b40d7e75aa04cab3877265f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnucash-devel/Makefile | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diffs:
diff --git a/gnucash-devel/Makefile b/gnucash-devel/Makefile
index b34bc39743..63b7b529ca 100644
--- a/gnucash-devel/Makefile
+++ b/gnucash-devel/Makefile
@@ -21,23 +21,18 @@ DEPENDS+=		p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
 DEPENDS+=		dconf-[0-9]*:../../devel/dconf
 
 USE_LANGUAGES=		c c++
+USE_CMAKE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake intltool makeinfo msgfmt perl:run pkg-config
-# for ninja
-#USE_TOOLS+=		intltool makeinfo msgfmt perl:run pkg-config
-
 INFO_FILES=		yes
+USE_TOOLS+=		intltool makeinfo msgfmt perl:run pkg-config
+# remove when using ninja
+USE_TOOLS+=		gmake
 
 MAKE_ENV+=		GUILE_AUTO_COMPILE=0
-USE_CMAKE=		yes
 CMAKE_ARGS+=		-DGMOCK_ROOT=${WRKDIR}/googletest-release-1.8.0/googlemock
 CMAKE_ARGS+=		-DGTEST_ROOT=${WRKDIR}/googletest-release-1.8.0/googletest
 CMAKE_ARGS+=		-DWITH_AQBANKING=OFF
 CMAKE_ARGS+=		-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
-#CFLAGS+=		-Wno-error
-#CXXFLAGS+=		-Wno-error
-#CMAKE_ARGS+=		-DCMAKE_C_FLAGS=${CFLAGS:Q}
-#CMAKE_ARGS+=		-DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
 #CMAKE_ARGS+=		-GNinja
 #BUILD_DEPENDS+=		ninja-build-[0-9]*:../../devel/ninja-build
 
@@ -62,13 +57,10 @@ post-install:
 	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/config ${DESTDIR}${PREFIX}/share/examples/gnucash/gnucash/config
 	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/environment ${DESTDIR}${PREFIX}/share/examples/gnucash/gnucash/environment
 
-# for CMake build
+# remove after 2.7.5
 pre-patch:
 	${MKDIR} -p ${WRKSRC}/gnucash/ugly-hack
 
-pre-build:
-	${MKDIR} -p ${WRKDIR}/.home/.local/share
-
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0


Home | Main Index | Thread Index | Old Index