I'm looking at packaging x2go for Fedora and am running into a few issues
which I'm hoping to get resolved.
nx-libs:
- bin/Makefile doesn't support DESTDIR. The attached nx-libs-destdir.patch
partially addresses that.
- The various nx*/configure.in files do not honor passed in compiler flags.
The attached nx-libs-optflags.patch fixes that. Note also though that CFLAGS
is used in some and CPPFLAGS in others.
- Is there a preferred way to install into /usr rather than /usr/local? I
ended up doing:
sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
- It would be very nice if you could support installing into /usr/lib64. I
had to do the following:
sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl
sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
make install ... USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx
# Make sure x2goagent is linked relative and on 64-bit
rm -rf %{buildroot}%{_prefix}/lib/x2go
mkdir -p %{buildroot}%{_libdir}/x2go/bin
ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
x2goserver:
- Does not honor passed in CFLAGS. The attached x2goserver-cflags.patch fixes.
- Again, very hard to use /usr/lib64...
x2goclient:
- Required the attached x2goclient-include.patch to build. There is no qt4
prefix on Fedora, and in general that should be specified by -I...
General:
- Why the use of install -o root -g root? Is this a debian build specific
thing? On rpm systems this fails when builds are done as non-root (and it's
redundant when done as root).
Thank you for your attention.
- Orion
--
Orion Poplawski
Technical Manager 303-415-9701 x222
NWRA, Boulder Office FAX: 303-415-9702
3380 Mitchell Lane or...@nwra.com
Boulder, CO 80301 http://www.nwra.com
diff -up nx-libs-3.5.0.16/bin/Makefile.destdir nx-libs-3.5.0.16/bin/Makefile
--- nx-libs-3.5.0.16/bin/Makefile.destdir 2012-11-10 06:40:56.000000000 -0700
+++ nx-libs-3.5.0.16/bin/Makefile 2012-12-11 13:32:26.589921544 -0700
@@ -17,13 +17,14 @@ X2GOLIBDIR=$(PREFIX)/lib/x2go
echo "Nothing to do for $@..."
install:
- $(INSTALL_DIR) $(X2GOLIBDIR)/bin/
- ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent
- find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
- find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
+ $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
+ ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
+ [ ! -d $(DESTDIR)$(BINDIR) ] && $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+ find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done
+ find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done
uninstall:
- find nx* | while read file; do rm -f $(BINDIR)/$$file; done
- find x2go* | while read file; do rm -f $(BINDIR)/$$file; done
- $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent
- $(RM_DIR) $(X2GOLIBDIR)/bin/
+ find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done
+ find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done
+ $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
+ $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
diff -up nx-libs-3.5.0.16/nxcomp/configure.in.optflags nx-libs-3.5.0.16/nxcomp/configure.in
--- nx-libs-3.5.0.16/nxcomp/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700
+++ nx-libs-3.5.0.16/nxcomp/configure.in 2012-12-11 13:13:19.390229196 -0700
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
dnl Set our default compilation flags.
-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+CFLAGS="$CFLAGS -O3"
dnl Reset default linking directives.
diff -up nx-libs-3.5.0.16/nxcompext/configure.in.optflags nx-libs-3.5.0.16/nxcompext/configure.in
--- nx-libs-3.5.0.16/nxcompext/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700
+++ nx-libs-3.5.0.16/nxcompext/configure.in 2012-12-11 13:15:26.712576302 -0700
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
dnl Reset default compilation flags.
-CXXFLAGS="-O3"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CFLAGS="$CFLAGS -O3"
dnl Reset default linking directives.
diff -up nx-libs-3.5.0.16/nxcompshad/configure.in.optflags nx-libs-3.5.0.16/nxcompshad/configure.in
--- nx-libs-3.5.0.16/nxcompshad/configure.in.optflags 2012-11-10 06:40:56.000000000 -0700
+++ nx-libs-3.5.0.16/nxcompshad/configure.in 2012-12-11 13:13:25.915196300 -0700
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
dnl Reset default compilation flags.
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
dnl Reset default linking directives.
diff -up nx-libs-3.5.0.16/nxproxy/configure.in.optflags nx-libs-3.5.0.16/nxproxy/configure.in
--- nx-libs-3.5.0.16/nxproxy/configure.in.optflags 2012-11-10 06:40:55.000000000 -0700
+++ nx-libs-3.5.0.16/nxproxy/configure.in 2012-12-11 13:16:19.955301045 -0700
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
dnl Reset default compilation flags.
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
dnl Prefer headers and libraries from nx-X11 if present.
diff -up nx-libs-3.5.0.16/nx-X11/programs/xterm/configure.optflags nx-libs-3.5.0.16/nx-X11/programs/xterm/configure
diff -up x2goserver-3.1.1.9/x2goserver/Makefile.cflags x2goserver-3.1.1.9/x2goserver/Makefile
--- x2goserver-3.1.1.9/x2goserver/Makefile.cflags 2012-12-11 09:43:43.289223321 -0700
+++ x2goserver-3.1.1.9/x2goserver/Makefile 2012-12-11 09:46:13.096309801 -0700
@@ -37,7 +37,7 @@ build: build-arch build-indep
build-arch: build_setgidwrappers
build_setgidwrappers:
- gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
+ gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
build-indep: build_man2html
diff -up x2goclient-3.99.3.0/sshmasterconnection.cpp.include x2goclient-3.99.3.0/sshmasterconnection.cpp
--- x2goclient-3.99.3.0/sshmasterconnection.cpp.include 2012-11-07 08:18:42.000000000 -0700
+++ x2goclient-3.99.3.0/sshmasterconnection.cpp 2012-12-10 16:44:24.246749290 -0700
@@ -42,7 +42,7 @@
#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */
#include <arpa/inet.h>
#include <netinet/tcp.h>
-#include <qt4/QtNetwork/qabstractsocket.h>
+#include <QtNetwork/qabstractsocket.h>
#endif
_______________________________________________
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
