SF.net SVN: gar:[24332] csw/mgar/pkg/wesnoth/trunk

jake_goerzen at users.sourceforge.net jake_goerzen at users.sourceforge.net
Wed Nov 12 17:57:46 CET 2014


Revision: 24332
          http://sourceforge.net/p/gar/code/24332
Author:   jake_goerzen
Date:     2014-11-12 16:57:44 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
wesnoth: recipe updates and cmake build adjustments

Modified Paths:
--------------
    csw/mgar/pkg/wesnoth/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/wesnoth/trunk/files/Makefile.20141111
    csw/mgar/pkg/wesnoth/trunk/files/README.NOTES

Modified: csw/mgar/pkg/wesnoth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/Makefile	2014-11-12 13:12:42 UTC (rev 24331)
+++ csw/mgar/pkg/wesnoth/trunk/Makefile	2014-11-12 16:57:44 UTC (rev 24332)
@@ -1,4 +1,3 @@
-# NOTE: Autotools build depreciated switching to cmake.
 # NOTE: cmake finds boost library but "mgar build" step can't find boost 
 #	headers and setting EXTRA_INC or EXTRA_CPPFLAGS doesn't help.
 NAME = wesnoth
@@ -18,10 +17,26 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)
 
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWemacs-common
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlnet
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlttf
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlmixer
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibglib2-0-0
+
 NOGITPATCH = 1
 
-EXTRA_INC = /opt/csw/gxx/include
-
 GARCOMPILER = GNU
 
 TEST_SCRIPTS =
@@ -34,24 +49,38 @@
 
 include gar/category.mk
 
+# ./configure needs this to find ggettext
+PATH := /opt/csw/gnu:$(PATH)
+
 # Autotools build depreciated now using cmake
 configure-custom:
 	mkdir $(WORKSRC)/build
 	cd $(WORKSRC)/build && \
-	CMAKE_INCLUDE_PATH=/opt/csw/gxx/include:/opt/csw/include \
-	CMAKE_LIBRARY_PATH=/opt/csw/gxx/lib:/opt/csw/lib \
-	CC=gcc CXX=g++ \
-	/opt/csw/bin/cmake \
+	CC=gcc CXX=g++ CXXFLAGS=-Wno-delete-non-virtual-dtor \
+	CPPFLAGS=-I/opt/csw/gxx/include LDFLAGS="-lintl -lsocket -Bdirect" \
+	/opt/csw/bin/cmake VERBOSE=1 \
 	-DCMAKE_INSTALL_PREFIX=/opt/csw \
-	-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-	-DCMAKE_CPP_FLAGS=-I/opt/csw/gxx/include \
-	-DBoost_INCLUDE_DIR=/opt/csw/gxx/include ..
+	-DCMAKE_INCLUDE_PATH=/opt/csw/gxx/include /opt/csw/include \
+	-DCMAKE_LIBRARY_PATH=/opt/csw/gxx/lib /opt/csw/lib \
+	-DCMAKE_INSTALL_RPATH:STRING="/opt/csw/lib/\$$ISALIST:/opt/csw/lib:/opt/csw/gxx/lib" \
+	-DBoost_DEBUG:BOOL=ON \
+	-DBOOST_INCLUDEDIR=/opt/csw/gxx/include \
+	..
 	@$(MAKECOOKIE)
 
 build-custom:
-	cd $(WORKSRC)/build && /opt/csw/bin/gmake
+	# Link the boost headers to the build/src directory in order to work-
+	# around boost headers not being found even though we try to include
+	# them see above (CPPFLAGS) and (-DCMAKE_INCLUDE_PATH).
+	ln -s /opt/csw/gxx/include/boost $(WORKSRC)/build/src/
+	cd $(WORKSRC)/build && /opt/csw/bin/gmake VERBOSE=1
 	@$(MAKECOOKIE)
 
 install-custom:
 	cd $(WORKSRC)/build && /opt/csw/bin/gmake install DESTDIR=$(DESTDIR)
 	@$(MAKECOOKIE)
+
+post-install-modulated:
+	# remove .gitignore files from the package install
+	find $(DESTDIR) -type f -name ".gitignore" -exec rm -f {} \;
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/wesnoth/trunk/files/Makefile.20141111
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/Makefile.20141111	                        (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/Makefile.20141111	2014-11-12 16:57:44 UTC (rev 24332)
@@ -0,0 +1,66 @@
+# NOTE: Autotools build depreciated switching to cmake.
+# NOTE: cmake finds boost library but "mgar build" step can't find boost 
+#	headers and setting EXTRA_INC or EXTRA_CPPFLAGS doesn't help.
+NAME = wesnoth
+VERSION = 1.10.7
+GARTYPE = v2
+
+DESCRIPTION = A free turn-based strategy game with a fanasy theme
+define BLURB
+  Build up a great army, gradually turning raw recruits into hardened veterans. In later games, recall your toughest warriors and form a deadly host against whom none can stand! Choose units from a large pool of specialists, and hand-pick a force with the right strengths to fight well on different terrains against all manner of opposition.  
+endef
+
+MASTER_SITES += $(SF_MIRRORS)
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89495
+UPSTREAM_USE_SF = 1
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)
+
+NOGITPATCH = 1
+
+GARCOMPILER = GNU
+
+TEST_SCRIPTS =
+
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
+
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+include gar/category.mk
+
+# ./configure needs this to find ggettext
+PATH := /opt/csw/gnu:$(PATH)
+
+# Autotools build depreciated now using cmake
+configure-custom:
+	mkdir $(WORKSRC)/build
+	cd $(WORKSRC)/build && \
+	CC=gcc CXX=g++ \
+	/opt/csw/bin/cmake VERBOSE=1 \
+	-DCMAKE_INSTALL_PREFIX=/opt/csw \
+	-DCMAKE_INCLUDE_PATH=/opt/csw/gxx/include /opt/csw/include \
+	-DCMAKE_LIBRARY_PATH=/opt/csw/gxx/lib /opt/csw/lib \
+	-DCMAKE_CXX_FLAGS=-Wno-delete-non-virtual-dtor \
+	-DCMAKE_EXE_LINKER_FLAGS=-lintl -lsocket \
+	-DCMAKE_INSTALL_RPATH=/opt/csw/lib/\$$ISALIST /opt/csw/lib \
+	-DBoost_DEBUG=ON \
+	-DBOOST_INCLUDEDIR=/opt/csw/gxx/include \
+	--check-system-vars \
+	..
+	@$(MAKECOOKIE)
+
+build-custom:
+	# Copy the boost headers to the build/src directory in order to work-
+	# around boost headers not being found even though we try to include
+	# them see above (CMAKE_INCLUDE_PATH).
+	cp -r /opt/csw/gxx/include/boost $(WORKSRC)/build/src/
+	cd $(WORKSRC)/build && /opt/csw/bin/gmake VERBOSE=1
+	@$(MAKECOOKIE)
+
+install-custom:
+	cd $(WORKSRC)/build && /opt/csw/bin/gmake install DESTDIR=$(DESTDIR)
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/wesnoth/trunk/files/README.NOTES
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/README.NOTES	                        (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/README.NOTES	2014-11-12 16:57:44 UTC (rev 24332)
@@ -0,0 +1,29 @@
+CMAKE_EXE_LINKER_FLAGS:STRING=-lintl -lsocket
+
+
+//Flags used by the CXX compiler during normal builds.
+CMAKE_CXX_FLAGS:STRING='-O2 -W -Wall -std=c++98 -Werror -Wno-strict-aliasing -Wn
+o-unused-local-typedefs -Wno-literal-suffix -Wno-delete-non-virtual-dtor '-
+
+
+
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWemacs-common
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlnet
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlttf
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlmixer
+RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibglib2-0-0
+
+need to take out RPATH from CMake build
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list