From 0d0bc5bc0de6de1caf139a03b01742cb8d367770 Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" Date: Sat, 14 Jan 2017 17:51:05 +0900 Subject: [PATCH] Remove all SHORTARCH related stuff --- crew | 11 ----------- lib/package.rb | 5 ----- packages/bc.rb | 4 ++-- packages/clisp.rb | 4 ++-- packages/ffcall.rb | 4 ++-- packages/flex.rb | 4 ++-- packages/fontconfig.rb | 4 ++-- packages/freetype.rb | 4 ++-- packages/gdal.rb | 4 ++-- packages/geos.rb | 4 ++-- packages/imagemagick.rb | 4 ++-- packages/libgd.rb | 4 ++-- packages/libjpeg.rb | 4 ++-- packages/libpng.rb | 4 ++-- packages/libsigsegv.rb | 4 ++-- packages/libtiff.rb | 4 ++-- packages/libxml2.rb | 4 ++-- packages/libxslt.rb | 4 ++-- packages/mapserver.rb | 4 ++-- packages/openconnect.rb | 4 ++-- packages/proj4.rb | 4 ++-- 21 files changed, 38 insertions(+), 54 deletions(-) diff --git a/crew b/crew index d46e57d9a..95ed5225e 100755 --- a/crew +++ b/crew @@ -23,17 +23,6 @@ else end ARCH = `uname -m`.strip -#SHORTARCH = `getconf LONG_BIT`.strip # will refactor this line in the future -case ARCH - when "i686" - SHORTARCH="32" - when "x86_64" - SHORTARCH="64" - when "armv7l" - SHORTARCH="32" - else - SHORTARCH="32" -end $LOAD_PATH.unshift "#{CREW_LIB_PATH}lib" diff --git a/lib/package.rb b/lib/package.rb index bcb3646a0..275050a80 100644 --- a/lib/package.rb +++ b/lib/package.rb @@ -28,11 +28,6 @@ class Package end def self.system(*args) - # strip -m32 option and convert lib32 to lib for the case of ARM to avoid SHORTARCH flood - if ARCH == "armv7l" - args = args.map {|s| s.gsub("-m32", "")} - args = args.map {|s| s.gsub("lib32", "lib")} - end # add "-j#{CREW_NPROC}" argument to "make" if args[0] == "make" # modify ["make", "args", ...] into ["make", "-j#{CREW_NPROC}", "args", ...] diff --git a/packages/bc.rb b/packages/bc.rb index 3e39e02d8..4a45796b7 100644 --- a/packages/bc.rb +++ b/packages/bc.rb @@ -1,14 +1,14 @@ require 'package' class Bc < Package - version '1.06' + version '1.06-1' source_url 'http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz' source_sha1 'c8f258a7355b40a485007c40865480349c157292' depends_on 'flex' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/" + system "./configure" system "make" end diff --git a/packages/clisp.rb b/packages/clisp.rb index 4e85941fd..fc307e669 100644 --- a/packages/clisp.rb +++ b/packages/clisp.rb @@ -1,7 +1,7 @@ require 'package' class Clisp < Package - version '2.49' + version '2.49-1' source_url 'ftp://ftp.gnu.org/pub/gnu/clisp/release/2.49/clisp-2.49.tar.bz2' source_sha1 '7e8d585ef8d0d6349ffe581d1ac08681e6e670d4' @@ -9,7 +9,7 @@ class Clisp < Package depends_on 'ffcall' def self.build - system "./configure CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" FileUtils.cd('src') do system "ulimit -s 16384" system "make" diff --git a/packages/ffcall.rb b/packages/ffcall.rb index 8f241a89d..5977c0fcf 100644 --- a/packages/ffcall.rb +++ b/packages/ffcall.rb @@ -1,12 +1,12 @@ require 'package' class Ffcall < Package - version '1.10' + version '1.10-1' source_url 'http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz' source_sha1 '6b4fdc7bd38b434bbf3d65508a3d117fc8b349f3' def self.build - system "./configure --prefix=/usr/local --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure --prefix=/usr/local CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/flex.rb b/packages/flex.rb index 82bd445c8..0aa198d0e 100644 --- a/packages/flex.rb +++ b/packages/flex.rb @@ -1,7 +1,7 @@ require 'package' class Flex < Package - version '2.5.39' + version '2.5.39-1' source_url 'http://fossies.org/linux/misc/flex-2.6.0.tar.gz' source_sha1 'cfe10b5de4893ced356adc437e78018e715818c3' @@ -9,7 +9,7 @@ class Flex < Package depends_on 'bison' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb index 065106668..02e7025ee 100644 --- a/packages/fontconfig.rb +++ b/packages/fontconfig.rb @@ -1,7 +1,7 @@ require 'package' class Fontconfig < Package - version '2.11.94' + version '2.11.94-1' source_url 'http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.94.tar.gz' source_sha1 '3748d8a2b9cf8052dbd003f524d829157f1ead83' @@ -9,7 +9,7 @@ class Fontconfig < Package depends_on 'freetype' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/freetype.rb b/packages/freetype.rb index e472eaa50..43560d2a6 100644 --- a/packages/freetype.rb +++ b/packages/freetype.rb @@ -1,12 +1,12 @@ require 'package' class Freetype < Package - version '2.6' + version '2.6-1' source_url 'http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz' source_sha1 '12dd3267af62cccc32045ed99984f3d8a8ddbf90' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/gdal.rb b/packages/gdal.rb index 622179c3a..8d568b8bc 100644 --- a/packages/gdal.rb +++ b/packages/gdal.rb @@ -1,7 +1,7 @@ require 'package' class Gdal < Package - version '1.11.2' + version '1.11.2-1' source_url 'http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz' source_sha1 '6f3ccbe5643805784812072a33c25be0bbff00db' @@ -12,7 +12,7 @@ class Gdal < Package depends_on 'libxml2' def self.build - 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 "./configure 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 diff --git a/packages/geos.rb b/packages/geos.rb index 3d2b25f6b..f6b56bbfc 100644 --- a/packages/geos.rb +++ b/packages/geos.rb @@ -1,12 +1,12 @@ require 'package' class Geos < Package - version '3.4.2' + version '3.4.2-1' source_url 'http://download.osgeo.org/geos/geos-3.4.2.tar.bz2' source_sha1 'b8aceab04dd09f4113864f2d12015231bb318e9a' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/imagemagick.rb b/packages/imagemagick.rb index c998faf6f..81b3ad01c 100644 --- a/packages/imagemagick.rb +++ b/packages/imagemagick.rb @@ -1,14 +1,14 @@ require 'package' class Imagemagick < Package - version '6.9.2-10' + version '6.9.2-10-1' source_url 'http://www.imagemagick.org/download/releases/ImageMagick-6.9.2-10.tar.xz' source_sha1 'd0b3fdf8f25856bf0058716703f7bf989560d2ce' depends_on 'pkgconfig' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --without-python" + system "./configure CFLAGS=\" -fPIC\" --without-python" system "make" end diff --git a/packages/libgd.rb b/packages/libgd.rb index cb6207603..d91563356 100644 --- a/packages/libgd.rb +++ b/packages/libgd.rb @@ -1,7 +1,7 @@ require 'package' class Libgd < Package - version '2.0.33' + version '2.0.33-1' source_url 'https://github.com/libgd/libgd/archive/GD_2_0_33.tar.gz' source_sha1 '489e25f18d3fc9d7f8b0e4889f98f5aa25363c3e' @@ -9,7 +9,7 @@ class Libgd < Package def self.build FileUtils.cd('src') do - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end end diff --git a/packages/libjpeg.rb b/packages/libjpeg.rb index 56a6b8f56..2f30b3b15 100644 --- a/packages/libjpeg.rb +++ b/packages/libjpeg.rb @@ -1,12 +1,12 @@ require 'package' class Libjpeg < Package - version '9.1' + version '9.1-1' source_url 'http://www.ijg.org/files/jpegsrc.v9a.tar.gz' source_sha1 'd65ed6f88d318f7380a3a5f75d578744e732daca' def self.build - system "./configure --includedir=/usr/local/include --libdir=/usr/local/lib#{SHORTARCH} CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure --includedir=/usr/local/include CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/libpng.rb b/packages/libpng.rb index 9c32904a2..0394b2a30 100644 --- a/packages/libpng.rb +++ b/packages/libpng.rb @@ -1,12 +1,12 @@ require 'package' class Libpng < Package - version '1.6.26' + version '1.6.26-1' source_url 'http://prdownloads.sourceforge.net/libpng/libpng-1.6.26.tar.gz' source_sha1 '3b2652f89b8fdcb6c29e9ed7642dfcfc0bbcf17e' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/libsigsegv.rb b/packages/libsigsegv.rb index c5621f8cf..c74274d83 100644 --- a/packages/libsigsegv.rb +++ b/packages/libsigsegv.rb @@ -1,12 +1,12 @@ require 'package' class Libsigsegv < Package - version '2.10' + version '2.10-1' source_url 'ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.10.tar.gz' source_sha1 'b75a647a9ebda70e7a3b33583efdd550e0eac094' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/libtiff.rb b/packages/libtiff.rb index ad8cb048f..b3e723a75 100644 --- a/packages/libtiff.rb +++ b/packages/libtiff.rb @@ -1,12 +1,12 @@ require 'package' class Libtiff < Package - version '4.0.7' + version '4.0.7-1' source_url 'ftp://download.osgeo.org/libtiff/tiff-4.0.7.tar.gz' source_sha1 '2c1b64478e88f93522a42dd5271214a0e5eae648' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end diff --git a/packages/libxml2.rb b/packages/libxml2.rb index 373f55638..7e5d86924 100644 --- a/packages/libxml2.rb +++ b/packages/libxml2.rb @@ -1,12 +1,12 @@ require 'package' class Libxml2 < Package - version '2.9.2' + version '2.9.2-1' source_url 'http://xmlsoft.org/sources/libxml2-2.9.2.tar.gz' source_sha1 'f46a37ea6d869f702e03f393c376760f3cbee673' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --without-python" + system "./configure CFLAGS=\" -fPIC\" --without-python" system "make" end diff --git a/packages/libxslt.rb b/packages/libxslt.rb index 3a2fb367f..42af04403 100644 --- a/packages/libxslt.rb +++ b/packages/libxslt.rb @@ -1,12 +1,12 @@ require 'package' class Libxslt < Package - version '1.1.28' + version '1.1.28-1' source_url 'http://xmlsoft.org/sources/libxslt-1.1.28.tar.gz' source_sha1 '4df177de629b2653db322bfb891afa3c0d1fa221' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --without-python" + system "./configure CFLAGS=\" -fPIC\" --without-python" system "make" end diff --git a/packages/mapserver.rb b/packages/mapserver.rb index 6a469a927..eec7e521e 100644 --- a/packages/mapserver.rb +++ b/packages/mapserver.rb @@ -1,12 +1,12 @@ require 'package' class Mapserver < Package - version '5.6.9' + version '5.6.9-1' source_url 'http://download.osgeo.org/mapserver/mapserver-5.6.9.tar.gz' source_sha1 '3f05bf6c9a32b34408e36ddd32f61d68d65cf01c' def self.build - 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 "./configure 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 diff --git a/packages/openconnect.rb b/packages/openconnect.rb index 94ea1761b..45534e499 100644 --- a/packages/openconnect.rb +++ b/packages/openconnect.rb @@ -27,7 +27,7 @@ require 'package' # > ip tuntap del mode tun tun0 class Openconnect < Package - version '7.06' + version '7.06-1' source_url 'ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz' source_sha1 '2351408693aab0c6bc97d37e68b4a869fbb217ed' @@ -36,7 +36,7 @@ class Openconnect < Package depends_on 'gnutls' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\" --with-vpnc-script=/usr/local/etc/vpnc/vpnc-script" + system "./configure CFLAGS=\" -fPIC\" --with-vpnc-script=/usr/local/etc/vpnc/vpnc-script" system "make" end diff --git a/packages/proj4.rb b/packages/proj4.rb index ca9ce7185..452ec73e2 100644 --- a/packages/proj4.rb +++ b/packages/proj4.rb @@ -1,12 +1,12 @@ require 'package' class Proj4 < Package - version '4.9.1' + version '4.9.1-1' source_url 'http://download.osgeo.org/proj/proj-4.9.1.tar.gz' source_sha1 '0bc63a41f1bdcff600d076c056f796007abf3f2f' def self.build - system "./configure --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\"" + system "./configure CFLAGS=\" -fPIC\"" system "make" end