[visualvm] 01/02: drop hardening-wrapper in favor of dpkg-buildflags

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository visualvm.

commit 99a3bc862bc8f3ab98eb0d6d115f78b7a7622708
Author: tony mancill <tmancill at debian.org>
Date:   Wed Jul 2 22:29:22 2014 -0700

    drop hardening-wrapper in favor of dpkg-buildflags
    
    update the 01-gcc-settings.patch to respect LDFLAGS
---
 debian/control                       | 1 -
 debian/patches/01-gcc-settings.patch | 6 ++++--
 debian/rules                         | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f4ef54e..2fbdab0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 9),
  default-jdk,
  ant,
  ant-optional,
- hardening-wrapper,
  libnb-platform-devel-java (>= 7.0),
  libnb-platform18-java,
  quilt,
diff --git a/debian/patches/01-gcc-settings.patch b/debian/patches/01-gcc-settings.patch
index bb60181..97e46e8 100644
--- a/debian/patches/01-gcc-settings.patch
+++ b/debian/patches/01-gcc-settings.patch
@@ -3,13 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-neede
 --- a/netbeans/lib.profiler/native/build/buildnative-linux64.sh
 +++ b/netbeans/lib.profiler/native/build/buildnative-linux64.sh
-@@ -47,8 +47,8 @@
+@@ -47,8 +47,10 @@
          JAVA_HOME=$1
          JDK_ID=$2
          echo $JAVA_HOME $JDK_ID
 -	gcc32 -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -m64  \
 -	-o ../../release/lib/deployed/$JDK_ID/linux-amd64/libprofilerinterface.so \
-+	gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DLINUX -pthread -fPIC -shared -O3 -Wall -g $ARCHFLAG  \
++	gcc -I$JAVA_HOME/include -I$JAVA_HOME/include/linux \
++	-DLINUX -pthread -fPIC -shared -O3 -Wall -g $ARCHFLAG  \
++	$LDFLAGS \
 +	-o ../../release/lib/deployed/libprofilerinterface-$JDK_ID.so \
  	../src-jdk15/class_file_cache.c \
  	../src-jdk15/attach.c \
diff --git a/debian/rules b/debian/rules
index 7907c13..3c9a436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export JAVA_HOME = /usr/lib/jvm/default-java
-
-export DEB_BUILD_HARDENING=1
+export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(filter $(DEB_HOST_ARCH), s390))
   ARCHFLAG="-m31"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git