summaryrefslogtreecommitdiff
path: root/extra/nx
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-13 11:26:30 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-13 11:26:30 -0300
commitea319c11ce5dcbe5994f166ea099b115bbffe960 (patch)
tree365b7a8276a93d738840c4481a1ff5e327920738 /extra/nx
parent37936150d275890b518542e93a435ab5815d722b (diff)
parent21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/conntrack-tools/01-config-file-path.patch community-testing/conntrack-tools/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/gigi/PKGBUILD community-testing/glob2/PKGBUILD community-testing/megaglest/PKGBUILD community-testing/openimageio/PKGBUILD community/gtk2hs-buildtools/PKGBUILD community/haddock/PKGBUILD community/haskell-dataenc/PKGBUILD community/haskell-ghc-paths/PKGBUILD community/haskell-haskeline/PKGBUILD community/haskell-hslogger/PKGBUILD community/haskell-tar/PKGBUILD community/haskell-terminfo/PKGBUILD community/haskell-utf8-string/PKGBUILD community/haskell-x11-xft/PKGBUILD community/libnetfilter_acct/PKGBUILD community/libnetfilter_conntrack/PKGBUILD community/libnetfilter_queue/PKGBUILD community/libnfnetlink/PKGBUILD community/sfk/PKGBUILD extra/cabal-install/PKGBUILD extra/claws-mail/PKGBUILD extra/haskell-http/PKGBUILD extra/haskell-mtl/PKGBUILD extra/haskell-network/PKGBUILD extra/haskell-parsec/PKGBUILD extra/haskell-text/PKGBUILD extra/haskell-transformers/PKGBUILD extra/haskell-zlib/PKGBUILD extra/nx/PKGBUILD extra/ocaml/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-libtiff/PKGBUILD multilib/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD social/squirm/PKGBUILD staging/kdebindings-python/PKGBUILD testing/curl/PKGBUILD testing/dnsutils/PKGBUILD testing/dnsutils/remove-bind.patch testing/mesa/PKGBUILD testing/openldap/PKGBUILD testing/pam/PKGBUILD testing/subversion/PKGBUILD testing/systemd/PKGBUILD testing/sysvinit/PKGBUILD
Diffstat (limited to 'extra/nx')
-rw-r--r--extra/nx/PKGBUILD39
-rw-r--r--extra/nx/nx-cflags.patch54
2 files changed, 88 insertions, 5 deletions
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index fa5bc6408..ba0cc4c10 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,24 +1,53 @@
-# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $
+# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
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' 'mips64el')
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
diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch
new file mode 100644
index 000000000..35562939c
--- /dev/null
+++ b/extra/nx/nx-cflags.patch
@@ -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