This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository higan.
commit 05814eddfa3a88894535a84645c3ad86729feb62 Author: Tobias Hansen <than...@debian.org> Date: Mon Oct 9 22:08:33 2017 +0100 Refresh patches, remove noopt.patch. --- debian/changelog | 2 ++ debian/patches/find_cairo.patch | 10 +++++----- debian/patches/makefile-fixes.patch | 22 ++++++++++------------ debian/patches/nall-makefile-fixes.patch | 2 +- debian/patches/noopt.patch | 17 ----------------- debian/patches/series | 1 - debian/patches/tomoko-makefile-fixes.patch | 4 ++-- debian/patches/use-XDG_CONFIG_HOME.patch | 2 +- debian/rules | 10 ++++++++-- 9 files changed, 29 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ba2b23..371402f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ higan (105-1) UNRELEASED; urgency=medium * New upstream release. + * Remove noopt.patch, makefile now allows build without optimization + by setting build=debug. -- Tobias Hansen <than...@debian.org> Mon, 09 Oct 2017 21:52:49 +0100 diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch index a8047c7..b76891e 100644 --- a/debian/patches/find_cairo.patch +++ b/debian/patches/find_cairo.patch @@ -4,12 +4,12 @@ Author: Tobias Hansen <than...@debian.org> --- a/higan/GNUmakefile +++ b/higan/GNUmakefile -@@ -19,7 +19,7 @@ - else ifeq ($(platform),macosx) - flags += -march=native +@@ -23,7 +23,7 @@ + link += -dynamiclib + endif else ifneq ($(filter $(platform),linux bsd),) - flags += -fopenmp + flags += -fopenmp $(shell pkg-config gtk+-2.0 --cflags) link += -fopenmp - link += -Wl,-export-dynamic - link += -lX11 -lXext -ldl + ifeq ($(binary),application) + link += -Wl,-export-dynamic diff --git a/debian/patches/makefile-fixes.patch b/debian/patches/makefile-fixes.patch index 373dac4..22e1bb2 100644 --- a/debian/patches/makefile-fixes.patch +++ b/debian/patches/makefile-fixes.patch @@ -11,16 +11,14 @@ Author: Tobias Hansen <than...@debian.org> --- a/higan/GNUmakefile +++ b/higan/GNUmakefile -@@ -19,10 +19,10 @@ - else ifeq ($(platform),macosx) - flags += -march=native - else ifneq ($(filter $(platform),linux bsd),) -- flags += -march=native -fopenmp -+ flags += -fopenmp +@@ -26,9 +26,8 @@ + flags += -fopenmp link += -fopenmp - link += -Wl,-export-dynamic -- link += -lX11 -lXext -+ link += -lX11 -lXext -ldl - else - $(error "unsupported platform") - endif + ifeq ($(binary),application) +- flags += -march=native + link += -Wl,-export-dynamic +- link += -lX11 -lXext ++ link += -lX11 -lXext -ldl + else ifeq ($(binary),library) + flags += -fPIC + link += -shared diff --git a/debian/patches/nall-makefile-fixes.patch b/debian/patches/nall-makefile-fixes.patch index 3d3b992..3a8e90c 100644 --- a/debian/patches/nall-makefile-fixes.patch +++ b/debian/patches/nall-makefile-fixes.patch @@ -32,7 +32,7 @@ Author: Tobias Hansen <than...@debian.org> # compiler detection ifeq ($(compiler),) @@ -51,7 +51,7 @@ - else ifeq ($(platform),macosx) + else ifeq ($(platform),macos) compiler := clang++ else ifeq ($(platform),linux) - compiler := g++-4.9 diff --git a/debian/patches/noopt.patch b/debian/patches/noopt.patch deleted file mode 100644 index 35c774c..0000000 --- a/debian/patches/noopt.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Support DEB_BUILD_OPTIONS='noopt' - This patch adds support for DEB_BUILD_OPTIONS=noopt, - which is convenient for debugging. -Author: Michael Gold <mich...@bitplane.org> -Bug-Debian: http://bugs.debian.org/737364 - ---- a/nall/GNUmakefile -+++ b/nall/GNUmakefile -@@ -61,7 +61,7 @@ - - # build settings - ifeq ($(build),release) -- flags += -O3 -+ flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3) - else ifeq ($(build),stable) - flags += -O1 - else ifeq ($(build),debug) diff --git a/debian/patches/series b/debian/patches/series index ca59900..ba6309c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ nall-makefile-fixes.patch makefile-fixes.patch desktop-file.patch sjlj-declare-xopen-source.patch -noopt.patch use-XDG_CONFIG_HOME.patch find_cairo.patch use_sharedpath.patch diff --git a/debian/patches/tomoko-makefile-fixes.patch b/debian/patches/tomoko-makefile-fixes.patch index 8008084..dae9cc3 100644 --- a/debian/patches/tomoko-makefile-fixes.patch +++ b/debian/patches/tomoko-makefile-fixes.patch @@ -5,7 +5,7 @@ Author: Tobias Hansen <than...@debian.org> --- a/higan/target-tomoko/GNUmakefile +++ b/higan/target-tomoko/GNUmakefile -@@ -85,9 +85,7 @@ +@@ -84,9 +84,7 @@ endif install: @@ -13,6 +13,6 @@ Author: Tobias Hansen <than...@debian.org> - $(error "make install should not be run as root") -else ifeq ($(platform),windows) +ifeq ($(platform),windows) - else ifeq ($(platform),macosx) + else ifeq ($(platform),macos) mkdir -p ~/Library/Application\ Support/$(name)/ mkdir -p ~/Emulation/System/ diff --git a/debian/patches/use-XDG_CONFIG_HOME.patch b/debian/patches/use-XDG_CONFIG_HOME.patch index 237fe98..3a20f63 100644 --- a/debian/patches/use-XDG_CONFIG_HOME.patch +++ b/debian/patches/use-XDG_CONFIG_HOME.patch @@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/738270 --- a/nall/path.hpp +++ b/nall/path.hpp @@ -80,7 +80,13 @@ - #elif defined(PLATFORM_MACOSX) + #elif defined(PLATFORM_MACOS) string result = {Path::user(), "Library/Application Support/"}; #else - string result = {Path::user(), ".config/"}; diff --git a/debian/rules b/debian/rules index 873e47a..34d4f64 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,12 @@ ifeq (,$(findstring $(DEB_BUILD_ARCH_CPU),"amd64 i386 powerpc")) export DEB_BUILD_MAINT_OPTIONS=hardening=-fortify endif +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + BUILDOPT=build=optimize +else + BUILDOPT=build=debug +endif + %: dh $@ --sourcedirectory=higan @@ -15,9 +21,9 @@ override_dh_auto_clean: override_dh_auto_build: mkdir -p icarus/obj icarus/out - $(MAKE) --directory=icarus + $(MAKE) --directory=icarus $(BUILDOPT) mkdir -p higan/obj higan/out - dh_auto_build + dh_auto_build -- $(BUILDOPT) override_dh_auto_install: dh_auto_install -- prefix=../debian/tmp/usr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/higan.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits