Ticket #10: x86_64.diff

release/autopackage-build

@@ -409 +409 @@
-
-tar -c --bzip2 --file "autopackage.tar.bz2" "autopackage/"
-! "$autopackage_silent" && out "finished."
-
-
-
+
+
+
+
+
+
+
-! "$autopackage_silent" && out " "
-
-x86
+$cpu_architecture
-! "$autopackage_silent" && out "Moved tools package to $PWD/autopackage.tar.bz2 ."
-
-rm -fr "$apkg_build_dir"

makepackage

@@ -694 +694 @@
-                return 1
-        fi
-
-        if [[ "$CPUARCHITECTURES" != "x86" ]] && [[ "$CPUARCHITECTURES" != "" ]]; then
-                red; outn "ERROR: "; normal; out "Sorry, autopackage is x86 only for now. Please do not request non-x86 architectures."
-                return 1
-        fi
-
-
-        # **********************************************************
-        #  2.4 Set Meta Defaults
-        # **********************************************************
@@ -750 +745 @@
-                COMPRESSION="bzip2"
-        fi
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        # determine interface version and normalize
-        local interfaceversion_major=`getMajor "$INTERFACEVERSION"`
@@ -903 +907 @@
-        stub=$( echo "$stub" | replaceStr "%SoftwareVersion%" "$SOFTWAREVERSION" )
-        stub=$( echo "$stub" | replaceStr "%InterfaceVersion%" "$INTERFACEVERSION" )
-        stub=$( echo "$stub" | replaceStr "%PackageVersion%" "$PACKAGEVERSION" )
-%" "$CPUARCHITECTURE
+s%" "$CPUARCHITECTURES
-        stub=$( echo "$stub" | replaceStr "%AutopackageTarget%" "$AUTOPACKAGETARGET" )
-
-        # Make the built package require the current autopackage version

share/apkg-script-utils

@@ -419 +419 @@
-
-
-##
+# _getLibraryPath <LIBRARY>
+# LIBRARY: The name of the library
+# Outputs: Paths of the library
+# Returns: non-zero if the library isn't found at all
+#
+# Get's the path of a library and automatically filters by the architecture.
+# For example if $cpu_architecture is "x86_64" it will return the path of the 64 bit library.
+# If $cpu_architecture is "x86" or isn't set, only 32 bit libraries will be returned.
+### START GETLIBRARYPATHS
+function _getLibraryPaths() {
+        local lib=""
+        lib=$1
+        if [[ "$lib" == "" ]]; then
+                err "must specify the library to check for"
+                popOptE
+                return 1
+        fi
+        
+    local cacheresult
+    cacheresult=$( /sbin/ldconfig -p | grep "${lib}\(\.[[:digit:]\.]*\)\?$" | awk 'BEGIN {FS=" => "} { print $2 }' | while read; do test -f "$REPLY" && echo $REPLY; done )
+        local libpathresult=`_scanLDLibPath "${lib}"`
+    local liblist=`echo -e "${libpathresult}\n${cacheresult}" | grep "\(.\)" | sort | uniq`
+    local result="";
+    if [[ "$liblist" == "" ]]; then warn "$1 not found"; popOptE; return 1; fi; # not found in cache
+
+    # make sure that libraries in $liblist are compatible with our architecture
+    local proper_architecture=false
+
+    local oIFS="$IFS"
+    IFS=$'\n';
+
+    local l
+    local -a liblist_array
+    liblist_array=($liblist);
+    liblist=""
+    for l in "${liblist_array[@]}"; do
+        if isLibrary32 "$l"; then
+                if [[ "$cpu_architecture" != "x86_64" ]]; then
+                proper_architecture=true
+                liblist=$(echo -e "$liblist$l\n")
+            fi
+        else
+                if [[ "$cpu_architecture" == "x86_64" ]]; then
+                proper_architecture=true
+                liblist=$(echo -e "$liblist$l\n")
+            fi
+        fi
+    done
+
+    IFS="$oIFS"
+    
+    echo $liblist
+}
+### END GETLIBRARYPATHS
+
+##
-# testForLib [-v] [-i] LibraryName
-# -v: Verbose mode. Print each version number out on stdout.
-# -i: Print each unique interface version found on stdout.
@@ -471 +527 @@
-        return 1
-    fi
-
-
-
-
-
-
-
-
-
-
+
-
-    # make sure that libraries in $liblist are only valid 32-bit libs
-    local found_32bit=false
-
-    local oIFS="$IFS"
-    IFS=$'\n';
-
-    local l
-    local -a liblist_array
-    liblist_array=($liblist);
-    for l in "${liblist_array[@]}"; do
-        if isLibrary32 "$l"; then
-            found_32bit=true
-            break;
-        fi
-    done
-
-    IFS="$oIFS"
-
-    trace $found_32bit
-
-    if ! $found_32bit; then
-        warn "only 64-bit libraries were found, returning 1"
-        popOptE;
-        return 1
-    fi
-
-    if ! $verbose && ! $verbose_i; then
-        popOptE
-        return 0
-    fi
-
-    # we want to loop over the results until we find a library that matches the required version
-    (
-    echo "$liblist" | while read; do
@@ -3360 +3377 @@
-# Checks the system C library for the given version symbols. The missing symbols, if any
-# will be output to stdout.
-function _checkForGlibcVersions() {
-
-
+
+
+
+
+
-    else
-/lib/libc.so.6
+$lib
-    fi
-}
+        
-
-##
-# getPythonLibDir

share/apkg-dep

@@ -377 +377 @@
-
-        # Verify package matches machine cpu architecture
-        c=$( echo "$header" | grep CPUArchitecture | sed 's/# CPUArchitecture //' )
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                continue
-        fi
-

share/backend.template

@@ -97 +97 @@
-
-    # check if binary is usable on target machine, if not error
-    found=false
+    x86found=false
-    for a in $CPUARCHITECTURES; do
-        if [[ "$a" == "$cpu_architecture" ]]; then
-            found=true
+            break
-        fi
+        if [[ "$a" == "x86" ]]; then
+                x86found=true
+        fi
-    done
-    if ! $found; then
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    fi
-    trace passed cpu architecture payload check
-

share/apkg-funclib

@@ -403 +403 @@
-            # like Fedora. But, it's not right for pure64 distros like
-            # Debian/Ubuntu or Gentoo
-
-x86_64 | 
+
-                export cpu_architecture="x86";;
+            x86_64)
+                export cpu_architexture="x86_64";;
-
-        esac
-    fi
@@ -2206 +2208 @@
-                # check CPU arch is OK before we run any native code
-                needed_archs=$( echo "$tmp" | sed -n '1p' )
-                local found=false
+                                local x86found=false
-                for a in $needed_archs; do
-                    if [[ "$a" == "$cpu_architecture" ]]; then found=true; fi
+                                        if [[ "$a" == "x86" ]]; then x86found=true; fi
-                done
-
+
-                if ! $found; then
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                fi
-
-                trace passed cpu arch test

share/installer.template

@@ -24 +24 @@
-
-%ErrorMessage%
-
-# are we on 32bit (or 64bit + compat libs?)
-locateCommand uname
-cpu_architecture=`"$lc_location" -m`
-case "$cpu_architecture" in
-        i386 | i486 | i586 | i686 )
-                export cpu_architecture="x86";;
-esac
-
-if [[ "$cpu_architecture" != "x86" ]]; then
-        if [ ! -d /usr/lib32 ]; then
-                errorMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Please install the compatibility libraries and rerun install." "Error Installing Autopackage"
-                rm -rf "$WORKING_DIRECTORY"
-                exit 1
-        fi
-fi
-
-# setup XDG configuration variables scoped for autopackage
-#
-#   AUTOPACKAGE_CONFIG_HOME     User configuration directory

share/installer.2.template

@@ -24 +24 @@
-
-%ErrorMessage%
-
-# are we on 32bit (or 64bit + compat libs?)
-locateCommand uname
-cpu_architecture=`"$lc_location" -m`
-case "$cpu_architecture" in
-        i386 | i486 | i586 | i686 )
-                export cpu_architecture="x86";;
-esac
-
-if [[ "$cpu_architecture" != "x86" ]]; then
-        if [ ! -d /usr/lib32 ]; then
-                errorMessage "Sorry, Autopackage only supports x86 32-bit systems, or 64-bit systems with compatibility libraries installed. Please install the compatibility libraries and rerun install." "Error Installing Autopackage"
-                rm -rf "$WORKING_DIRECTORY"
-                exit 1
-        fi
-fi
-
-# setup XDG configuration variables scoped for autopackage
-#
-#   AUTOPACKAGE_CONFIG_HOME     User configuration directory