Move build/linux64 -> build/linux

Modified AppRun and jhbuildrc so that the build is 32/64 bit capable.

18 files changed, 61 insertions, 36 deletions

diff --git a/build/linux64/AppRun b/build/linux/AppRun
index 6ff9c88a..237f4647 100755
--- a/build/linux64/AppRun
+++ b/build/linux/AppRun
@@ -4,7 +4,7 @@
 INSTALL_PREFIX=/home/tristan/AppImages/Install
 
 # Base environment variables
-LD_LIBRARY_PATH=${APPDIR}${INSTALL_PREFIX}/lib64:${APPDIR}${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=${APPDIR}${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
 PATH=${APPDIR}${INSTALL_PREFIX}/bin:${PATH}
 XDG_DATA_DIRS=${APPDIR}${INSTALL_PREFIX}/share:${XDG_DATA_DIRS}
 export LD_LIBRARY_PATH PATH XDG_DATA_DIRS
@@ -20,15 +20,15 @@ export PANGO_RC_FILE
 # GTK+/GIO/GdkPixbuf environment variables
 # http://askubuntu.com/questions/251712/how-can-i-install-a-gsettings-schema-without-root-privileges
 GSETTINGS_SCHEMA_DIR=${APPDIR}${INSTALL_PREFIX}/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}
-GDK_PIXBUF_MODULE_FILE=${APPDIR}${INSTALL_PREFIX}/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
-GTK_PATH=${APPDIR}${INSTALL_PREFIX}/lib64/gtk-3.0
+GDK_PIXBUF_MODULE_FILE=${APPDIR}${INSTALL_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+GTK_PATH=${APPDIR}${INSTALL_PREFIX}/lib/gtk-3.0
 GTK_DATA_PREFIX=${APPDIR}${INSTALL_PREFIX}
 GTK_THEME=Adwaita
 export GSETTINGS_SCHEMA_DIR GDK_PIXBUF_MODULE_FILE GTK_PATH GTK_DATA_PREFIX GTK_THEME
 
 # Glade environment variables
 GLADE_CATALOG_SEARCH_PATH=${APPDIR}${INSTALL_PREFIX}/share/glade/catalogs
-GLADE_MODULE_SEARCH_PATH=${APPDIR}${INSTALL_PREFIX}/lib64/glade/modules
+GLADE_MODULE_SEARCH_PATH=${APPDIR}${INSTALL_PREFIX}/lib/glade/modules
 GLADE_PIXMAP_DIR=${APPDIR}${INSTALL_PREFIX}/share/glade/pixmaps
 GLADE_BUNDLED=1
 export GLADE_CATALOG_SEARCH_PATH GLADE_MODULE_SEARCH_PATH GLADE_PIXMAP_DIR GLADE_BUNDLED
diff --git a/build/linux64/LibcWrapGenerator.vala b/build/linux/LibcWrapGenerator.vala
index 6844e352..6844e352 100644
--- a/build/linux64/LibcWrapGenerator.vala
+++ b/build/linux/LibcWrapGenerator.vala
diff --git a/build/linux64/PrepareAppDir.sh b/build/linux/PrepareAppDir.sh
index 0f009860..0f009860 100755
--- a/build/linux64/PrepareAppDir.sh
+++ b/build/linux/PrepareAppDir.sh
diff --git a/build/linux64/README b/build/linux/README
index 4c1bc7a4..4c1bc7a4 100644
--- a/build/linux64/README
+++ b/build/linux/README
diff --git a/build/linux64/README.lfs b/build/linux/README.lfs
index 3d68b112..3d68b112 100644
--- a/build/linux64/README.lfs
+++ b/build/linux/README.lfs
diff --git a/build/linux/jhbuildrc b/build/linux/jhbuildrc
new file mode 100644
index 00000000..52dd7fb2
--- /dev/null
+++ b/build/linux/jhbuildrc
@@ -0,0 +1,57 @@
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
+use_local_modulesets = True
+modulesets_dir = os.getenv('GLADE_DIR') + '/build/linux/modulesets'
+moduleset = 'bundle.modules'
+
+# Unset autogenargs (screws with some modules like freetype)
+autogenargs = ''
+
+build_cflags = ''
+
+# For 32bit builds, build for 32bit arches
+if os.environ.get('BUILD_32BIT') is not None:
+    build_cflags = ' -m32'
+
+# _FORTIFY_SOURCE can be defined by default in some compilers
+# we want to unset this because glibc's runtime checkers are only
+# available in recent versions of glibc
+build_cflags += ' -U_FORTIFY_SOURCE'
+
+# Special case for cairo compilation, with libcwrap.h applied cairo
+# is unable to do it's mutexes properly
+build_cflags += ' -DCAIRO_NO_MUTEX=1'
+
+# Include the libcwrap.h before anything else for every source, this
+# ensures we are targetting the right version of glibc
+build_cflags += ' -include ' + os.getenv('GLADE_DIR') + '/build/linux/libcwrap.h'
+
+# Set the compiler flags for both C and C++ sources, overriding CC and CXX
+# ensures that they come before any flags that any buildscripts might add
+os.environ['CC']  = 'gcc ' + build_cflags
+os.environ['CXX'] = 'g++ ' + build_cflags
+build_cflags = None
+
+# Enable our custom triggers
+os.environ['JHBUILD_TRIGGERS'] = os.getenv('GLADE_DIR') + '/build/linux/triggers'
+
+# A list of the modules to build.
+modules = [ 'glade' ]
+
+# Where to put the tarballs
+tarballdir = "~/AppImages/Tarballs"
+
+# Where to unpack sources
+checkoutroot = '~/AppImages/Sources'
+
+# the prefix to configure/install modules to (must have write access)
+prefix = '~/AppImages/Install'
+
+# Dont put anything into a lib64 directory, whether we build for
+# 32bit linux or 64bit linux, we want a constant path for the libraries
+use_lib64 = False
+
+# Uncomment this for verbose builds
+makeargs = "V=1"
+
diff --git a/build/linux64/libcwrap.h b/build/linux/libcwrap.h
index 69585379..69585379 100644
--- a/build/linux64/libcwrap.h
+++ b/build/linux/libcwrap.h
diff --git a/build/linux64/modulesets/bundle.modules b/build/linux/modulesets/bundle.modules
index beaed79d..beaed79d 100644
--- a/build/linux64/modulesets/bundle.modules
+++ b/build/linux/modulesets/bundle.modules
diff --git a/build/linux64/modulesets/patches/cairo-avoid-longjmp.patch b/build/linux/modulesets/patches/cairo-avoid-longjmp.patch
index 571beef8..571beef8 100644
--- a/build/linux64/modulesets/patches/cairo-avoid-longjmp.patch
+++ b/build/linux/modulesets/patches/cairo-avoid-longjmp.patch
diff --git a/build/linux64/modulesets/patches/pango-old-fontconfig.patch b/build/linux/modulesets/patches/pango-old-fontconfig.patch
index d3e9051d..d3e9051d 100644
--- a/build/linux64/modulesets/patches/pango-old-fontconfig.patch
+++ b/build/linux/modulesets/patches/pango-old-fontconfig.patch
diff --git a/build/linux64/modulesets/patches/pango-relative-paths.patch b/build/linux/modulesets/patches/pango-relative-paths.patch
index 09ac19d0..09ac19d0 100644
--- a/build/linux64/modulesets/patches/pango-relative-paths.patch
+++ b/build/linux/modulesets/patches/pango-relative-paths.patch
diff --git a/build/linux64/pangorc b/build/linux/pangorc
index d8a745e1..d8a745e1 100644
--- a/build/linux64/pangorc
+++ b/build/linux/pangorc
diff --git a/build/linux64/triggers/gdk-pixbuf.trigger b/build/linux/triggers/gdk-pixbuf.trigger
index ef105f41..ef105f41 100644
--- a/build/linux64/triggers/gdk-pixbuf.trigger
+++ b/build/linux/triggers/gdk-pixbuf.trigger
diff --git a/build/linux64/triggers/glib.trigger b/build/linux/triggers/glib.trigger
index f9f08e72..f9f08e72 100644
--- a/build/linux64/triggers/glib.trigger
+++ b/build/linux/triggers/glib.trigger
diff --git a/build/linux64/triggers/gtk+.trigger b/build/linux/triggers/gtk+.trigger
index 2e598fbe..2e598fbe 100644
--- a/build/linux64/triggers/gtk+.trigger
+++ b/build/linux/triggers/gtk+.trigger
diff --git a/build/linux64/triggers/mime-database.trigger b/build/linux/triggers/mime-database.trigger
index e680795e..e680795e 100644
--- a/build/linux64/triggers/mime-database.trigger
+++ b/build/linux/triggers/mime-database.trigger
diff --git a/build/linux64/triggers/pango.trigger b/build/linux/triggers/pango.trigger
index d3662a74..d3662a74 100644
--- a/build/linux64/triggers/pango.trigger
+++ b/build/linux/triggers/pango.trigger
diff --git a/build/linux64/jhbuildrc b/build/linux64/jhbuildrc
deleted file mode 100644
index 52fbafff..00000000
--- a/build/linux64/jhbuildrc
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- mode: python -*-
-# -*- coding: utf-8 -*-
-
-use_local_modulesets = True
-modulesets_dir = os.getenv('GLADE_DIR') + '/build/linux64/modulesets'
-moduleset = 'bundle.modules'
-
-# Unset autogenargs (screws with some modules like freetype)
-autogenargs = ''
-
-# Make sure we require a low libc dependency when compiling C or C++
-os.environ['CC']  = 'gcc -U_FORTIFY_SOURCE -DCAIRO_NO_MUTEX=1 -include ' + os.getenv('GLADE_DIR') + '/build/linux64/libcwrap.h'
-os.environ['CXX'] = 'g++ -U_FORTIFY_SOURCE -DCAIRO_NO_MUTEX=1 -include ' + os.getenv('GLADE_DIR') + '/build/linux64/libcwrap.h'
-
-# Enable our custom triggers
-os.environ['JHBUILD_TRIGGERS'] = os.getenv('GLADE_DIR') + '/build/linux64/triggers'
-
-# A list of the modules to build.
-modules = [ 'glade' ]
-
-# Where to put the tarballs
-tarballdir = "~/AppImages/Tarballs"
-
-# Where to unpack sources
-checkoutroot = '~/AppImages/Sources'
-
-# the prefix to configure/install modules to (must have write access)
-prefix = '~/AppImages/Install'
-
-# Uncomment this for verbose builds
-makeargs = "V=1"
-