[arch-commits] Commit in nx/trunk (PKGBUILD nx-cflags.patch)

[andyrtr at archlinux.org]

    Date: Monday, October 8, 2012 @ 14:51:45
  Author: andyrtr
Revision: 168321

upgpkg: nx 3.5.0.15-2

honor our CFLAGS/LDFLAGS; this will allow also debug builds

Added:
  nx/trunk/nx-cflags.patch
Modified:
  nx/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   37 +++++++++++++++++++++++++++++++++----
 nx-cflags.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-08 17:04:46 UTC (rev 168320)
+++ PKGBUILD	2012-10-08 18:51:45 UTC (rev 168321)
@@ -4,21 +4,50 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.15
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
-options=('!makeflags')
+options=('!makeflags') # '!strip')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        nx-x11.ld.so.conf.d)
+        nx-x11.ld.so.conf.d
+        nx-cflags.patch)
 md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
-         'f2ec60c7e2d81bef2f7292d2b33681a6')
+         'f2ec60c7e2d81bef2f7292d2b33681a6'
+         'd0c5b88aac0473e19699cf62d84b9d5f')
 
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+  # Gentoo hacks to honor cflags
+  patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+  # Run autoreconf in all neeed folders
+  for i in nxcomp nxcompext nxcompshad nxproxy; do
+     cd ${i}
+     autoreconf -vfi #${i}
+     cd ..
+  done
+  
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+    
   make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
   # fake install
   mkdir $srcdir/fakeinstall

Added: nx-cflags.patch
===================================================================
--- nx-cflags.patch	                        (rev 0)
+++ nx-cflags.patch	2012-10-08 18:51:45 UTC (rev 168321)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+--- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then