Bug#737364: higan: should support DEB_BUILD_OPTIONS='noopt nostrip'

[Michael Gold]

Package: higan
Version: 094-2
Severity: minor
Tags: patch

This patch adds support for DEB_BUILD_OPTIONS=noopt and
DEB_BUILD_OPTIONS=nostrip, which are convenient for debugging.

- Michael


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.11-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages higan depends on:
ii  libao4                    1.1.0-2
ii  libasound2                1.0.27.2-3
ii  libatk1.0-0               2.10.0-2
ii  libc6                     2.17-97
ii  libcairo2                 1.12.16-2
ii  libfontconfig1            2.11.0-2
ii  libfreetype6              2.5.2-1
ii  libgcc1                   1:4.8.2-14
ii  libgdk-pixbuf2.0-0        2.28.2-1+b1
ii  libgl1-mesa-glx [libgl1]  9.2.2-1
ii  libglib2.0-0              2.36.4-1
ii  libgtk2.0-0               2.24.22-1
ii  libopenal1                1:1.14-4
ii  libpango-1.0-0            1.36.0-1+b1
ii  libpangocairo-1.0-0       1.36.0-1+b1
ii  libpangoft2-1.0-0         1.36.0-1+b1
ii  libpulse0                 4.0-6+b1
ii  libsdl1.2debian           1.2.15-8
ii  libstdc++6                4.8.2-14
ii  libudev1                  204-6
ii  libx11-6                  2:1.6.2-1
ii  libxext6                  2:1.3.2-1
ii  libxv1                    2:1.0.10-1

higan recommends no packages.

higan suggests no packages.

-- no debconf information

diff --git a/Makefile b/Makefile
index 0db5b9682a18..296b0e59ca56 100755
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@ target  := ethos
 # console := true
 
 # compiler
-flags   += -I. -O3 -fomit-frame-pointer
+flags   += -I.
+flags   += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3 -fomit-frame-pointer)
 link    +=
 objects := libco
 
@@ -39,14 +40,17 @@ ifeq ($(platform),windows)
   else
     link += -mwindows
   endif
-  link += -s -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32
+  link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s)
+  link += -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32
   link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
 else ifeq ($(platform),macosx)
   flags += -march=native
 else ifeq ($(platform),linux)
-  link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
+  link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s)
+  link += -Wl,-export-dynamic -lX11 -lXext -ldl
 else ifeq ($(platform),bsd)
-  link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
+  link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s)
+  link += -Wl,-export-dynamic -lX11 -lXext -ldl
 else
   $(error unsupported platform.)
 endif

signature.asc
Description: Digital signature