[mupen64plus-rsp-hle] 58/167: Rewrite Makefile to fix flags and linking
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:02:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.
commit 18e86decb24f3841d123a59b75ef897cae94bf18
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jul 23 17:46:07 2011 +0200
Rewrite Makefile to fix flags and linking
---
debian/changelog | 3 +
debian/patches/default-optimisations.patch | 40 ------
debian/patches/hurd_os.patch | 20 ---
debian/patches/rewrite_makefile.patch | 207 +++++++++++++++++++++++++++++
debian/patches/series | 3 +-
5 files changed, 211 insertions(+), 62 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de4d050..c130b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
mupen64plus-rsp-hle (1.99.4-3) UNRELEASED; urgency=low
* Mark all targets in debian/rules as phony
+ * debian/patches:
+ - Remove obsolete default-optimisations.patch, hurd_os.patch
+ - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
-- Sven Eckelmann <sven at narfation.org> Sat, 23 Jul 2011 16:42:47 +0200
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
deleted file mode 100644
index 46b975a..0000000
--- a/debian/patches/default-optimisations.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Don't override optimisations set by build environment
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d7b6a1ce850e9cb6dac4ef8f5d3952d1eb2d99f0..7d3be633676369092a750e8c6db4a569d8592eba 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -88,7 +88,7 @@ ifeq ("$(CPU)","NONE")
- endif
-
- # base CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
-+CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src
- CXXFLAGS += -fvisibility-inlines-hidden
-
- # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-@@ -111,9 +111,9 @@ ifeq ($(OS), LINUX)
- LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_api_export.ver
- ifeq ($(CPU), X86)
- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -pipe -O3 -march=athlon64
-+ CFLAGS += -pipe
- else
-- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
-+ CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
- endif
- endif
- endif
-@@ -128,9 +128,6 @@ ifeq ($(OS), OSX)
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
- # set mupen64plus core API header path
- ifneq ("$(APIDIR)","")
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
deleted file mode 100644
index 3c66c12..0000000
--- a/debian/patches/hurd_os.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add GNU/Hurd as operating system with "linux" userland
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 7d3be633676369092a750e8c6db4a569d8592eba..59a51052f427ff0a58e75f63c8fd0f2c0668d76b 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -39,6 +39,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
- SO_EXTENSION = so
- SHARED = -shared
- endif
-+ifneq ("$(filter GNU hurd,$(UNAME))","")
-+ OS = LINUX
-+ SO_EXTENSION = so
-+ SHARED = -shared
-+endif
- ifeq ("$(UNAME)","Darwin")
- OS = OSX
- SO_EXTENSION = dylib
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
new file mode 100644
index 0000000..c4805ea
--- /dev/null
+++ b/debian/patches/rewrite_makefile.patch
@@ -0,0 +1,207 @@
+Description: Rewrite Makefile to fix flags and linking
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index d7b6a1ce850e9cb6dac4ef8f5d3952d1eb2d99f0..b998287ae0bbab8a0ba11544f6931e9dd22a715d 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -49,6 +49,12 @@ ifeq ("$(UNAME)","FreeBSD")
+ SO_EXTENSION = so
+ SHARED = -shared
+ endif
++ifeq ("$(UNAME)","OpenBSD")
++ OS = FREEBSD
++ SO_EXTENSION = so
++ SHARED = -shared
++ $(warning OS type "$(UNAME)" not officially supported.')
++endif
+ ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
+ OS = LINUX
+ SO_EXTENSION = so
+@@ -87,35 +93,35 @@ ifeq ("$(CPU)","NONE")
+ $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
+ endif
+
+-# base CFLAGS, LIBS, and LDFLAGS
+-CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
++# base CFLAGS, LDLIBS, and LDFLAGS
++OPTFLAGS ?= -O3
++CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
+ CXXFLAGS += -fvisibility-inlines-hidden
++LDFLAGS += $(SHARED)
+
+ # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
+ # On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
+ ifeq ($(ARCH_DETECTED), 64BITS)
+- CFLAGS += -fPIC -DPIC
++ PIC ?= 1
+ endif
++ifeq ($(PIC), 1)
++ CFLAGS += -fPIC
++ LDFLAGS += -fPIC
++endif
++
+ # tweak flags for 32-bit build on 64-bit system
+ ifeq ($(ARCH_DETECTED), 64BITS_32)
+ ifeq ($(OS), FREEBSD)
+ $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
+ endif
+ CFLAGS += -m32
+- LDFLAGS += -m32 -m elf_i386
++ LDFLAGS += -m32 -Wl,-m,elf_i386
+ endif
+
+ # set special flags per-system
+ ifeq ($(OS), LINUX)
+ # only export api symbols
+ LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_api_export.ver
+- ifeq ($(CPU), X86)
+- ifeq ($(ARCH_DETECTED), 64BITS)
+- CFLAGS += -pipe -O3 -march=athlon64
+- else
+- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
+- endif
+- endif
+ endif
+ ifeq ($(OS), OSX)
+ ifeq ($(CPU), X86)
+@@ -128,9 +134,6 @@ ifeq ($(OS), OSX)
+ endif
+ endif
+ endif
+-ifeq ($(CPU), PPC)
+- CFLAGS += -mcpu=powerpc
+-endif
+
+ # set mupen64plus core API header path
+ ifneq ("$(APIDIR)","")
+@@ -154,20 +157,31 @@ else
+ endif
+ endif
+
+-# set shell function names
+-CC ?= gcc
+-CXX ?= g++
+-INSTALL ?= install
+-ifeq ($(OS),OSX)
+- STRIP ?= strip -x
+-else
+- STRIP ?= strip -s
++# reduced compile output when running make without V=1
++ifneq ($(findstring $(MAKEFLAGS),s),s)
++ifndef V
++ Q_CC = @echo ' CC '$@;
++ Q_CXX = @echo ' CXX '$@;
++ Q_LD = @echo ' LD '$@;
+ endif
++endif
++
++# set base program pointers and flags
++CC ?= gcc
++CXX ?= g++
++RM ?= rm -f
++INSTALL ?= install
++MKDIR ?= mkdir -p
++COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
++COMPILE.cc = $(Q_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
++LINK.o = $(Q_LD)$(CXX) $(LDFLAGS) $(TARGET_ARCH)
+
+ # set special flags for given Makefile parameters
+ ifeq ($(DEBUG),1)
+ CFLAGS += -g
+- STRIP = true # disable binary strip
++ INSTALL_STRIP_FLAG ?=
++else
++ INSTALL_STRIP_FLAG ?= -s
+ endif
+
+ # set installation options
+@@ -175,7 +189,10 @@ ifeq ($(PREFIX),)
+ PREFIX := /usr/local
+ endif
+ ifeq ($(LIBDIR),)
+- LIBDIR := $(PREFIX)/lib/mupen64plus
++ LIBDIR := $(PREFIX)/lib
++endif
++ifeq ($(PLUGINDIR),)
++ PLUGINDIR := $(LIBDIR)/mupen64plus
+ endif
+
+ SRCDIR = ../../src
+@@ -194,7 +211,7 @@ SOURCE = \
+ OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
+ OBJECTS += $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SOURCE)))
+ OBJDIRS = $(dir $(OBJECTS))
+-$(shell mkdir -p $(OBJDIRS))
++$(shell $(MKDIR) $(OBJDIRS))
+
+ # build targets
+ TARGET = mupen64plus-rsp-hle.$(SO_EXTENSION)
+@@ -210,25 +227,28 @@ targets:
+ @echo " Options:"
+ @echo " BITS=32 == build 32-bit binaries on 64-bit machine"
+ @echo " APIDIR=path == path to find Mupen64Plus Core headers"
++ @echo " OPTFLAGS=flag == compiler optimization (default: -O3)"
++ @echo " PIC=(1|0) == Force enable/disable of position independent code"
+ @echo " Install Options:"
+ @echo " PREFIX=path == install/uninstall prefix (default: /usr/local)"
+- @echo " LIBDIR=path == path to install plugin libraries (default: PREFIX/lib/mupen64plus)"
++ @echo " LIBDIR=path == library prefix (default: PREFIX/lib)"
++ @echo " PLUGINDIR=path == path to install plugin libraries (default: LIBDIR/mupen64plus)"
+ @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
+ @echo " Debugging Options:"
+ @echo " DEBUG=1 == add debugging symbols"
++ @echo " V=1 == show verbose compiler output"
+
+ all: $(TARGET)
+
+ install: $(TARGET)
+- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
+- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
++ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
++ $(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
+
+ uninstall:
+- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"
++ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+
+ clean:
+- rm -rf ./_obj/* $(TARGET)
+- rmdir ./_obj
++ $(RM) -r ./_obj $(TARGET)
+
+ rebuild: clean all
+
+@@ -238,23 +258,14 @@ CFLAGS += -MD
+
+ CXXFLAGS += $(CFLAGS)
+
+-# reduced compile output when running make without V=1
+-ifneq ($(findstring $(MAKEFLAGS),s),s)
+-ifndef V
+- Q_CC = @echo ' CC '$@;
+- Q_CXX = @echo ' CXX '$@;
+- Q_LD = @echo ' LD '$@;
+-endif
+-endif
+-
+-# build rules
+-
+-$(TARGET): $(OBJECTS)
+- $(Q_LD)$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@
+- $(STRIP) $@
+-
++# standard build rules
+ $(OBJDIR)/%.o: $(SRCDIR)/%.c
+- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
++ $(COMPILE.c) -o $@ $<
+
+ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
+- $(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $<
++ $(COMPILE.cc) -o $@ $<
++
++$(TARGET): $(OBJECTS)
++ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
++
++.PHONY: all clean install uninstall targets
diff --git a/debian/patches/series b/debian/patches/series
index 16e335d..c753e70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-default-optimisations.patch
-hurd_os.patch
+rewrite_makefile.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git
More information about the Pkg-games-commits
mailing list