delete newlines so output isn't broken

Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>
2026-01-09 15:37:56 -05:00 · 2015-12-08 11:14:05 -08:00
parent bf7fca98b4
commit b67390ee9b
18 changed files with 19 additions and 17 deletions
--- a/2
+++ b/2
@@ -15,6 +15,8 @@ CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/'
 CREW_BREW_DIR = CREW_PREFIX + '/tmp/crew/'
 CREW_DEST_DIR = CREW_BREW_DIR + '/dest'

+SHORTARCH = `getconf LONG_BIT | tr -d '\n\r'`
+
 $LOAD_PATH.unshift "#{CREW_LIB_PATH}lib"

 USER = `whoami`.chomp
--- a/packages/bc.rb
+++ b/packages/bc.rb
@@ -8,7 +8,7 @@ class Bc < Package
  depends_on 'flex'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/"
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/"
    system "make"
  end

--- a/packages/clisp.rb
+++ b/packages/clisp.rb
@@ -9,7 +9,7 @@ class Clisp < Package
  depends_on 'ffcall'

  def self.build
-    system "./configure CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    FileUtils.cd('src') do
      system "ulimit -s 16384"
      system "make"
--- a/packages/ffcall.rb
+++ b/packages/ffcall.rb
@@ -6,7 +6,7 @@ class Ffcall < Package
  source_sha1 '6b4fdc7bd38b434bbf3d65508a3d117fc8b349f3'

  def self.build
-    system "./configure --prefix=/usr/local --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --prefix=/usr/local --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end

--- a/packages/flex.rb
+++ b/packages/flex.rb
@@ -8,7 +8,7 @@ class Flex < Package
  depends_on 'm4'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end

--- a/packages/fontconfig.rb
+++ b/packages/fontconfig.rb
@@ -8,7 +8,7 @@ class Fontconfig < Package
  depends_on 'pkgconfig'

  def self.build
-      system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+      system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
      system "make"
  end

--- a/packages/freetype.rb
+++ b/packages/freetype.rb
@@ -6,7 +6,7 @@ class Freetype < Package
  source_sha1 '12dd3267af62cccc32045ed99984f3d8a8ddbf90'

  def self.build
-      system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+      system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
      system "make"
  end

--- a/packages/gdal.rb
+++ b/packages/gdal.rb
@@ -12,7 +12,7 @@ class Gdal < Package
  depends_on 'libxml2'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\" --with-png=internal --with-libtiff=internal --with-geotiff=internal --with-jpeg=internal --with-gif=internal --with-curl=/usr/local/bin/curl-config --with-geos=/usr/local/bin/geos-config --with-static-proj4=/usr/local/share/proj --with-python"
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --with-png=internal --with-libtiff=internal --with-geotiff=internal --with-jpeg=internal --with-gif=internal --with-curl=/usr/local/bin/curl-config --with-geos=/usr/local/bin/geos-config --with-static-proj4=/usr/local/share/proj --with-python"
    system "make"
  end

--- a/packages/geos.rb
+++ b/packages/geos.rb
@@ -6,7 +6,7 @@ class Geos < Package
  source_sha1 'b8aceab04dd09f4113864f2d12015231bb318e9a'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end

--- a/packages/libgd.rb
+++ b/packages/libgd.rb
@@ -7,7 +7,7 @@ class Libgd < Package

  def self.build
    FileUtils.cd('src') do
-      system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+      system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
      system "make"
    end
  end
--- a/packages/libjpeg.rb
+++ b/packages/libjpeg.rb
@@ -6,7 +6,7 @@ class Libjpeg < Package
  source_sha1 '7079f0d6c42fad0cfba382cf6ad322add1ace8f9'

  def self.build
-    system "./configure --includedir=/usr/local/include --libdir=/usr/local/lib64 CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --includedir=/usr/local/include --libdir=/usr/local/lib#{SHORTARCH} CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end

--- a/packages/libpng.rb
+++ b/packages/libpng.rb
@@ -6,7 +6,7 @@ class Libpng < Package
  source_sha1 'e912df0826dd6fb74f579ba60bf05c99807548ac'

  def self.build
-      system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+      system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
      system "make"
  end

--- a/packages/libsigsegv.rb
+++ b/packages/libsigsegv.rb
@@ -6,7 +6,7 @@ class Libsigsegv < Package
  source_sha1 'b75a647a9ebda70e7a3b33583efdd550e0eac094'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end

--- a/packages/libxml2.rb
+++ b/packages/libxml2.rb
@@ -6,7 +6,7 @@ class Libxml2 < Package
  source_sha1 'f46a37ea6d869f702e03f393c376760f3cbee673'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\" --without-python"
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --without-python"
    system "make"
  end

--- a/packages/mapserver.rb
+++ b/packages/mapserver.rb
@@ -6,7 +6,7 @@ class Mapserver < Package
  source_sha1 '3f05bf6c9a32b34408e36ddd32f61d68d65cf01c'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\" --with-gdal=/usr/local/bin/gdal-config --with-ogr --with-png --with-jpeg --without-pdf --with-agg --with-proj --with-threads --with-geos=/usr/local/bin/geos-config --with-tiff --with-wfs --with-wmsclient --with-wfsclient --with-curl-config=/usr/local/bin/curl-config --with-xml2-config=/usr/local/bin/xml2-config"
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --with-gdal=/usr/local/bin/gdal-config --with-ogr --with-png --with-jpeg --without-pdf --with-agg --with-proj --with-threads --with-geos=/usr/local/bin/geos-config --with-tiff --with-wfs --with-wmsclient --with-wfsclient --with-curl-config=/usr/local/bin/curl-config --with-xml2-config=/usr/local/bin/xml2-config"
    system "make"
  end

--- a/packages/openconnect.rb
+++ b/packages/openconnect.rb
@@ -36,7 +36,7 @@ class Openconnect < Package
  depends_on 'gnutls'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\" --with-vpnc-script=/usr/local/etc/vpnc/vpnc-script"
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --with-vpnc-script=/usr/local/etc/vpnc/vpnc-script"
    system "make"
  end

--- a/packages/pkgconfig.rb
+++ b/packages/pkgconfig.rb
@@ -8,7 +8,7 @@ class Pkgconfig < Package
  depends_on 'buildessential'

  def self.build
-      system "./configure --with-internal-glib --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+      system "./configure --with-internal-glib --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
      system "make"
  end

--- a/packages/proj4.rb
+++ b/packages/proj4.rb
@@ -6,7 +6,7 @@ class Proj4 < Package
  source_sha1 '0bc63a41f1bdcff600d076c056f796007abf3f2f'

  def self.build
-    system "./configure --libdir=/usr/local/lib64/ CC=\"gcc -m64\" CFLAGS=\" -fPIC\""
+    system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
    system "make"
  end