cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Override the arch setting to remove OpenBSD version from it,

Browse Source 
so ports don't have to be bumped when OpenBSD version changes.

OK landry@, jcs@
This commit is contained in:
jeremy 2011-07-19 17:06:39 +00:00
parent faf299a6e2
commit 9fe80155bd
4 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/rubinius/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2011/07/18 19:06:36 naddy Exp $ # $OpenBSD: Makefile,v 1.13 2011/07/19 17:09:56 jeremy Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT = Ruby virtual machine and core library
V= 1.2.3 V= 1.2.3
DISTNAME = rubinius-${V}-20110315 DISTNAME = rubinius-${V}-20110315
PKGNAME = rubinius-$V PKGNAME = rubinius-$V
REVISION = 1 REVISION = 2
CATEGORIES = lang lang/ruby CATEGORIES = lang lang/ruby
@ -38,7 +38,7 @@ MODULES = lang/ruby
USE_GMAKE = Yes USE_GMAKE = Yes
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
RBX_ARCH = ${MACHINE_ARCH}-openbsd${OSREV} RBX_ARCH = ${MACHINE_ARCH}-openbsd
RAKE_VER = 0.8.7 RAKE_VER = 0.8.7
RAKE_COMPILER_VER = 0.6.0 RAKE_COMPILER_VER = 0.6.0
RDOC_VER = 2.5.1 RDOC_VER = 2.5.1

16
lang/rubinius/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2011/07/19 17:09:56 jeremy Exp $
Override the os setting to remove OpenBSD version from it,
so ports don't have to be bumped when OpenBSD version changes.
--- configure.orig Mon Jul 18 16:42:20 2011
+++ configure Mon Jul 18 16:42:55 2011
@@ -24,7 +24,7 @@ class Configure
# TODO: conditionalize for Windows
@host = `./rakelib/config.guess`.chomp
/([^-]+)-([^-]+)-(.*)/ =~ @host
- @cpu, @vendor, @os = $1, $2, $3
+ @cpu, @vendor, @os = $1, $2, "openbsd"
@little_endian = false
@sizeof_long = 0

10
lang/ruby/1.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2011/07/18 19:06:37 naddy Exp $ # $OpenBSD: Makefile,v 1.15 2011/07/19 17:06:39 jeremy Exp $
COMMENT-main= object oriented script language with threads COMMENT-main= object oriented script language with threads
COMMENT-iconv= libiconv interface for ruby COMMENT-iconv= libiconv interface for ruby
@ -14,10 +14,10 @@ PKGNAME-iconv= ruby-iconv-${VERSION}.${PATCHLEVEL}
PKGNAME-gdbm= ruby-gdbm-${VERSION}.${PATCHLEVEL} PKGNAME-gdbm= ruby-gdbm-${VERSION}.${PATCHLEVEL}
PKGNAME-tk= ruby-tk-${VERSION}.${PATCHLEVEL} PKGNAME-tk= ruby-tk-${VERSION}.${PATCHLEVEL}
REVISION-main= 0 REVISION-main= 1
REVISION-iconv= 0 REVISION-iconv= 1
REVISION-gdbm= 0 REVISION-gdbm= 1
REVISION-tk= 0 REVISION-tk= 1
PKGSPEC-main= ruby->=1.8,<1.9 PKGSPEC-main= ruby->=1.8,<1.9

22
lang/ruby/1.8/patches/patch-configure
View File

@ -1,6 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2011/05/25 17:50:45 jasper Exp $ $OpenBSD: patch-configure,v 1.3 2011/07/19 17:06:39 jeremy Exp $
--- configure.orig Fri Feb 18 13:42:58 2011
+++ configure Wed May 25 19:46:16 2011 Override the arch setting to remove OpenBSD version from it,
so ports don't have to be bumped when OpenBSD version changes.
--- configure.orig Sat Jul 2 02:54:02 2011
+++ configure Mon Jul 18 15:21:06 2011
@@ -10706,7 +10706,7 @@ if test "$enable_shared" = 'yes'; then @@ -10706,7 +10706,7 @@ if test "$enable_shared" = 'yes'; then
;; ;;
openbsd*) openbsd*)
@ -10,3 +14,15 @@ $OpenBSD: patch-configure,v 1.2 2011/05/25 17:50:45 jasper Exp $
;; ;;
solaris*) solaris*)
SOLIBS='$(LIBS)' SOLIBS='$(LIBS)'
@@ -11009,7 +11009,10 @@ _ACEOF
_ACEOF
else
- arch="${target_cpu}-${target_os}"
+ case "$target_os" in
+ openbsd*) arch="$target_cpu-openbsd" ;;
+ *) arch="${target_cpu}-${target_os}" ;;
+ esac
cat >>confdefs.h <<_ACEOF
#define RUBY_PLATFORM "${arch}"
_ACEOF