[mupen64plus] 01/01: Build debugger
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:01:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch hack_debugger
in repository mupen64plus.
commit 29197ff58e767e90dba8b7d6a6c04e81146ecba3
Author: Sven Eckelmann <sven at narfation.org>
Date: Mon Jan 27 19:04:38 2014 +0100
Build debugger
---
debian/control | 1 +
debian/patches/ftbfs-dynarec.patch | 2 +-
debian/patches/noexecstack.patch | 2 +-
debian/patches/pie_support.patch | 10 ++--
debian/patches/series | 1 -
debian/patches/static-binutils-libs.patch | 32 ------------
debian/patches/system-liblzma.patch | 9 ++--
debian/patches/xdg-basedir.patch | 83 +++++++++++++++++--------------
debian/rules | 4 +-
9 files changed, 61 insertions(+), 83 deletions(-)
diff --git a/debian/control b/debian/control
index 8d7aa6e..dc5bf33 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Homepage: http://code.google.com/p/mupen64plus/
Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git
Build-Depends:
+ binutils-dev,
debhelper (>= 8.0.0),
hardening-includes,
libbz2-dev,
diff --git a/debian/patches/ftbfs-dynarec.patch b/debian/patches/ftbfs-dynarec.patch
index f0f9788..2bd3ff7 100644
--- a/debian/patches/ftbfs-dynarec.patch
+++ b/debian/patches/ftbfs-dynarec.patch
@@ -8,7 +8,7 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/Makefile b/Makefile
-index dac741e0ae8913d9220598d0ff6e95cf5016cf6a..01493e6e7f70fcd49ec784b97b54882404dbb599 100644
+index 64c9c9a8abf7c8d5ab76f422b496c3e72045972b..376d73d1c4011cae2e4fff2f13edf20bfcd49b33 100644
--- a/Makefile
+++ b/Makefile
@@ -157,22 +157,24 @@ ifneq ($(NO_ASM), 1)
diff --git a/debian/patches/noexecstack.patch b/debian/patches/noexecstack.patch
index ba18127..c0f26db 100644
--- a/debian/patches/noexecstack.patch
+++ b/debian/patches/noexecstack.patch
@@ -14,7 +14,7 @@ Author: Richard Goedeken <Richard at fascinationsoftware.com>
---
diff --git a/Makefile b/Makefile
-index 01493e6e7f70fcd49ec784b97b54882404dbb599..2368afa38816069f4fd176c1936c23f40d277095 100644
+index 376d73d1c4011cae2e4fff2f13edf20bfcd49b33..af5c7c998debd6cfc0e096afcf39e0a68fd53f5a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,13 +33,6 @@ ifeq ($(OS), LINUX)
diff --git a/debian/patches/pie_support.patch b/debian/patches/pie_support.patch
index 5b58802..f5986bf 100644
--- a/debian/patches/pie_support.patch
+++ b/debian/patches/pie_support.patch
@@ -4,19 +4,19 @@ Author: Richard Goedeken <Richard at fascinationsoftware.com>
---
diff --git a/Makefile b/Makefile
-index 59e0f4cefe29e702c894bea5edb321d3681a76e5..3dbec13d0ee300463b3e48c9dba87de7c915f5d7 100644
+index b29cbf3ec7f7940b78462407ebdf8b9acc5d6369..01485812b0b72f5a00e076b61c9bf44794ecce4e 100644
--- a/Makefile
+++ b/Makefile
-@@ -299,7 +299,7 @@ targets:
+@@ -298,7 +298,7 @@ targets:
all: version.h $(ALL)
mupen64plus: $(MISC_DEPS) version.h $(OBJECTS)
-- $(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@ $(STATIC_LIBS)
-+ $(CXX) $(OBJECTS) $(LDFLAGS) $(PIE_LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@ $(STATIC_LIBS)
+- $(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@
++ $(CXX) $(OBJECTS) $(LDFLAGS) $(PIE_LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@
ifneq ($(OS), WINDOWS)
$(STRIP) $@
endif
-@@ -355,10 +355,10 @@ else
+@@ -354,10 +354,10 @@ else
endif
.cpp.o:
diff --git a/debian/patches/series b/debian/patches/series
index a39beb1..dfc045c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ remove-nondfsg-icons.patch
glide64-noasm.patch
rice-texturepack-crash.patch
rice-screenflickering.patch
-static-binutils-libs.patch
fix-7z-subfolder.patch
xdg-basedir.patch
ftbfs-dynarec.patch
diff --git a/debian/patches/static-binutils-libs.patch b/debian/patches/static-binutils-libs.patch
deleted file mode 100644
index 25046c1..0000000
--- a/debian/patches/static-binutils-libs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Link binutils libraries with unstable abi as static library
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/Makefile b/Makefile
-index 4926931b0c9b1fc823edb13c83515086f3d80378..be81163f0a6aa91b109dc25c7bd3ce20d99d0370 100644
---- a/Makefile
-+++ b/Makefile
-@@ -238,11 +238,12 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
- ALL = mupen64plus $(PLUGINS)
- OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
- LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
-+STATIC_LIBS =
-
- # add extra objects and libraries for selected options
- ifeq ($(DBG), 1)
- OBJECTS += $(OBJ_DBG) $(OBJ_GTK_DBG_GUI)
-- LIBS += -lopcodes -lbfd
-+ STATIC_LIBS += /usr/lib/libopcodes.a
- endif
- ifeq ($(LIRC), 1)
- OBJECTS += $(OBJ_LIRC)
-@@ -305,7 +306,7 @@ targets:
- all: version.h $(ALL)
-
- mupen64plus: $(MISC_DEPS) version.h $(OBJECTS)
-- $(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@
-+ $(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@ $(STATIC_LIBS)
- ifneq ($(OS), WINDOWS)
- $(STRIP) $@
- endif
diff --git a/debian/patches/system-liblzma.patch b/debian/patches/system-liblzma.patch
index 554985c..ecb67c6 100644
--- a/debian/patches/system-liblzma.patch
+++ b/debian/patches/system-liblzma.patch
@@ -5,7 +5,7 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/Makefile b/Makefile
-index 2368afa38816069f4fd176c1936c23f40d277095..59e0f4cefe29e702c894bea5edb321d3681a76e5 100644
+index af5c7c998debd6cfc0e096afcf39e0a68fd53f5a..b29cbf3ec7f7940b78462407ebdf8b9acc5d6369 100644
--- a/Makefile
+++ b/Makefile
@@ -103,9 +103,6 @@ OBJ_CORE = \
@@ -18,19 +18,18 @@ index 2368afa38816069f4fd176c1936c23f40d277095..59e0f4cefe29e702c894bea5edb321d3
main/7zip/7zAlloc.o \
main/7zip/7zBuffer.o \
main/7zip/7zCrc.o \
-@@ -232,9 +229,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
+@@ -232,8 +229,8 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
# set primary objects and libraries for all outputs
ALL = mupen64plus $(PLUGINS)
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(XDGBASEDIR_LIBS) -lbz2
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) $(XDGBASEDIR_LIBS) -lbz2
- STATIC_LIBS =
-CFLAGS+= $(XDGBASEDIR_FLAGS)
++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) $(XDGBASEDIR_LIBS) -lbz2
+CFLAGS+= $(LZMA_FLAGS) $(XDGBASEDIR_FLAGS)
# add extra objects and libraries for selected options
ifeq ($(DBG), 1)
-@@ -330,7 +327,7 @@ endif
+@@ -329,7 +326,7 @@ endif
clean-core:
ifneq ($(OS), WINDOWS)
$(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o
diff --git a/debian/patches/xdg-basedir.patch b/debian/patches/xdg-basedir.patch
index ffba3b5..66805f7 100644
--- a/debian/patches/xdg-basedir.patch
+++ b/debian/patches/xdg-basedir.patch
@@ -34,16 +34,15 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/Makefile b/Makefile
-index be81163f0a6aa91b109dc25c7bd3ce20d99d0370..dac741e0ae8913d9220598d0ff6e95cf5016cf6a 100644
+index 4926931b0c9b1fc823edb13c83515086f3d80378..64c9c9a8abf7c8d5ab76f422b496c3e72045972b 100644
--- a/Makefile
+++ b/Makefile
-@@ -237,8 +237,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
+@@ -237,7 +237,8 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
# set primary objects and libraries for all outputs
ALL = mupen64plus $(PLUGINS)
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(XDGBASEDIR_LIBS) -lbz2
- STATIC_LIBS =
+CFLAGS+= $(XDGBASEDIR_FLAGS)
# add extra objects and libraries for selected options
@@ -463,7 +462,7 @@ index d57bafdce73ecf047898b36fd705a4d586fe8c0b..3c88498b7ccd3892e92fb6354085cace
case OPT_INSTALLDIR:
if(isdir(optarg))
strncpy(l_InstallDir, optarg, PATH_MAX);
-@@ -1249,49 +1279,79 @@ void parseCommandLine(int argc, char **argv)
+@@ -1249,53 +1279,42 @@ void parseCommandLine(int argc, char **argv)
/** setPaths
* setup paths to config/install/screenshot directories. The config dir is the dir where all
@@ -510,13 +509,31 @@ index d57bafdce73ecf047898b36fd705a4d586fe8c0b..3c88498b7ccd3892e92fb6354085cace
perror(NULL);
exit(errno);
}
-+ }
-+ }
-+
-+ // make sure config dir has a '/' on the end.
-+ if(l_ConfigDir[strlen(l_ConfigDir)-1] != '/')
-+ strncat(l_ConfigDir, "/", PATH_MAX - strlen(l_ConfigDir));
-+
+-
+- // create save subdir
+- strncpy(buf, l_ConfigDir, PATH_MAX);
+- strncat(buf, "/save", PATH_MAX - strlen(buf));
+- if(mkdir(buf, (mode_t)0755) != 0)
+- {
+- // report error, but don't exit
+- printf("Warning: Could not create %s: %s", buf, strerror(errno));
+- }
+-
+- // create screenshots subdir
+- strncpy(buf, l_ConfigDir, PATH_MAX);
+- strncat(buf, "/screenshots", PATH_MAX - strlen(buf));
+- if(mkdir(buf, (mode_t)0755) != 0)
+- {
+- // report error, but don't exit
+- printf("Warning: Could not create %s: %s", buf, strerror(errno));
+- }
+ }
+ }
+
+@@ -1303,6 +1322,72 @@ static void setPaths(void)
+ if(l_ConfigDir[strlen(l_ConfigDir)-1] != '/')
+ strncat(l_ConfigDir, "/", PATH_MAX - strlen(l_ConfigDir));
+
+ // if the data dir was not specified at the commandline, look for ~/.local/share/mupen64plus dir
+ if (strlen(l_DataDir) == 0)
+ {
@@ -533,34 +550,27 @@ index d57bafdce73ecf047898b36fd705a4d586fe8c0b..3c88498b7ccd3892e92fb6354085cace
+ perror(NULL);
+ exit(errno);
+ }
-
- // create save subdir
-- strncpy(buf, l_ConfigDir, PATH_MAX);
++
++ // create save subdir
+ strncpy(buf, l_DataDir, PATH_MAX);
- strncat(buf, "/save", PATH_MAX - strlen(buf));
-- if(mkdir(buf, (mode_t)0755) != 0)
++ strncat(buf, "/save", PATH_MAX - strlen(buf));
+ if(xdgMakePath(buf, (mode_t)0755) != 0)
- {
- // report error, but don't exit
- printf("Warning: Could not create %s: %s", buf, strerror(errno));
- }
-
- // create screenshots subdir
-- strncpy(buf, l_ConfigDir, PATH_MAX);
++ {
++ // report error, but don't exit
++ printf("Warning: Could not create %s: %s", buf, strerror(errno));
++ }
++
++ // create screenshots subdir
+ strncpy(buf, l_DataDir, PATH_MAX);
- strncat(buf, "/screenshots", PATH_MAX - strlen(buf));
-- if(mkdir(buf, (mode_t)0755) != 0)
++ strncat(buf, "/screenshots", PATH_MAX - strlen(buf));
+ if(xdgMakePath(buf, (mode_t)0755) != 0)
- {
- // report error, but don't exit
- printf("Warning: Could not create %s: %s", buf, strerror(errno));
-@@ -1299,9 +1359,34 @@ static void setPaths(void)
- }
- }
-
-- // make sure config dir has a '/' on the end.
-- if(l_ConfigDir[strlen(l_ConfigDir)-1] != '/')
-- strncat(l_ConfigDir, "/", PATH_MAX - strlen(l_ConfigDir));
++ {
++ // report error, but don't exit
++ printf("Warning: Could not create %s: %s", buf, strerror(errno));
++ }
++ }
++ }
++
+ // make sure data dir has a '/' on the end.
+ if(l_DataDir[strlen(l_DataDir)-1] != '/')
+ strncat(l_DataDir, "/", PATH_MAX - strlen(l_DataDir));
@@ -589,9 +599,10 @@ index d57bafdce73ecf047898b36fd705a4d586fe8c0b..3c88498b7ccd3892e92fb6354085cace
+ strncat(l_CacheDir, "/", PATH_MAX - strlen(l_CacheDir));
+
+ xdgWipeHandle(&xdgbasedirs);
-
++
// if install dir was not specified at the commandline, look for it in the executable's directory
if (strlen(l_InstallDir) == 0)
+ {
@@ -1400,7 +1485,7 @@ static void setPaths(void)
if (!ValidScreenshotDir())
{
diff --git a/debian/rules b/debian/rules
index 0a7d2ea..22fc93d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,10 @@ export PIE_LDFLAGS=$(HARDENING_DISABLE_PIE_LDFLAGS_FILTER)
LDFLAGS += -Wl,--as-needed
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-MAKEOPTIONS = UNAME='$(DEB_HOST_GNU_CPU)' DBGSYM=1 PREFIX=/usr/ LIBDIR=/usr/lib/mupen64plus/ BINDIR=/usr/games/
+MAKEOPTIONS = UNAME='$(DEB_HOST_GNU_CPU)' DBGSYM=1 PREFIX=/usr/ LIBDIR=/usr/lib/mupen64plus/ BINDIR=/usr/games/ DBG=1
%:
- dh $@ --parallel --list-missing
+ dh $@ --list-missing
get-orig-source:
uscan --verbose --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git
More information about the Pkg-games-commits
mailing list