[mupen64plus-core] 16/310: Build 32-bit library also with PIC

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit d3f814e5c9008b508f5d0c48c95a3974763c040b
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Fri Mar 5 15:19:58 2010 +0100

    Build 32-bit library also with PIC
---
 debian/patches/default-optimisations.patch | 18 +++++++++++++-----
 debian/patches/dejavu-font.patch           |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 41608f5..207b8c1 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 480252a7ce912669279e209fa101722b7b27c71e..201c5366844d18f42c906c3a0be6cd0e6762b161 100644
+index 480252a7ce912669279e209fa101722b7b27c71e..fb75706f771586cc66619f2b1f260d81ec3dd02e 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -74,7 +74,7 @@ ifeq ("$(CPU)","NONE")
+@@ -74,14 +74,10 @@ ifeq ("$(CPU)","NONE")
  endif
  
  # base CFLAGS, LIBS, and LDFLAGS
@@ -15,8 +15,16 @@ index 480252a7ce912669279e209fa101722b7b27c71e..201c5366844d18f42c906c3a0be6cd0e
 +CFLAGS += -Wall -fno-strict-aliasing -I../../src
  LIBS = -ldl -lpng -lz -lm -lfreetype
  
- # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-@@ -105,9 +105,9 @@ ifeq ($(OS), LINUX)
+-# 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 -fvisibility=hidden
+-endif
++CFLAGS += -fPIC -DPIC -fvisibility=hidden
+ # tweak flags for 32-bit build on 64-bit system
+ ifeq ($(ARCH_DETECTED), 64BITS_32)
+   ifeq ($(OS), FREEBSD)
+@@ -105,9 +101,9 @@ ifeq ($(OS), LINUX)
    LIBS += -L/usr/X11R6/lib -lGL -lGLU
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
@@ -28,7 +36,7 @@ index 480252a7ce912669279e209fa101722b7b27c71e..201c5366844d18f42c906c3a0be6cd0e
        ifneq ($(PROFILE), 1)
          CFLAGS += -fomit-frame-pointer
        endif
-@@ -131,9 +131,6 @@ ifeq ($(OS), OSX)
+@@ -131,9 +127,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index f1aeb36..dc49740 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de> Please enter the commit message f
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 201c5366844d18f42c906c3a0be6cd0e6762b161..c26d0dd9f9bd6fc599443fcea0bc8f88463bd208 100644
+index fb75706f771586cc66619f2b1f260d81ec3dd02e..8bdc808e030eaae142020012061fdd6a98ea5f60 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -362,7 +362,7 @@ install: $(TARGET)
+@@ -358,7 +358,7 @@ install: $(TARGET)
  	$(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git