mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

Unbreak the build.

Browse Source
This commit is contained in:
Akinori MUSHA 2003-04-26 21:17:35 +00:00
parent f7bdeed669
commit a23c4abe67
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=79688
6 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/ruby16_static/Makefile
View File

@ -33,6 +33,7 @@ LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
.if ${RUBY_VER} < 1.7
EXT_PORTS+= ${RUBY_SHIM18_PORT}
EXTRA_PATCHES= ${PATCHDIR}/ruby16-patch-*
.else
EXT_PORTS+= converters/ruby-iconv
.endif

25
lang/ruby16_static/files/patch-ext+bdb1+extconf.rb Normal file
View File

@ -0,0 +1,25 @@
--- ext/bdb1/extconf.rb.orig Fri Dec 27 22:32:58 2002
+++ ext/bdb1/extconf.rb Sun Apr 27 05:35:25 2003
@@ -1,9 +1,10 @@
#!/usr/bin/ruby
require 'mkmf'
+require 'rbconfig'
-$stat_lib = if CONFIG.key?("LIBRUBYARG_STATIC")
+$stat_lib = if Config::CONFIG.key?("LIBRUBYARG_STATIC")
$LDFLAGS += " -L#{CONFIG['libdir']}"
- CONFIG["LIBRUBYARG_STATIC"]
+ Config::CONFIG["LIBRUBYARG_STATIC"]
else
"-lruby"
end
@@ -40,8 +41,7 @@
unknown: $(DLLIB)
\t@echo "main() {}" > /tmp/a.c
-\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) #$stat_lib #{CONFIG["LIBS"
-]} $(LIBS) $(LOCAL_LIBS)
+\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) #$stat_lib #{Config::CONFIG["LIBS"]} $(LIBS) $(LOCAL_LIBS)
\t@-rm /tmp/a.c a.out
test: $(DLLIB)

11
lang/ruby16_static/files/ruby16-patch-ext+zlib+extconf.rb Normal file
View File

@ -0,0 +1,11 @@
--- ext/zlib/extconf.rb.orig Fri Mar 28 11:24:47 2003
+++ ext/zlib/extconf.rb Sun Apr 27 05:56:22 2003
@@ -24,7 +24,7 @@
oldlibs = $libs
oldlibpath = $LIBPATH
$libs += " " + Config::CONFIG['LIBRUBYARG']
- $LIBPATH = [$libdir, $archdir] | $LIBPATH
+ $LIBPATH = [$libdir, $archdir || Config::CONFIG["compile_dir"]] | $LIBPATH
begin
have_func s, 'ruby.h'
rescue ArgumentError # for ruby-1.4

1
lang/ruby_static/Makefile
View File

@ -33,6 +33,7 @@ LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
.if ${RUBY_VER} < 1.7
EXT_PORTS+= ${RUBY_SHIM18_PORT}
EXTRA_PATCHES= ${PATCHDIR}/ruby16-patch-*
.else
EXT_PORTS+= converters/ruby-iconv
.endif

25
lang/ruby_static/files/patch-ext+bdb1+extconf.rb Normal file
View File

@ -0,0 +1,25 @@
--- ext/bdb1/extconf.rb.orig Fri Dec 27 22:32:58 2002
+++ ext/bdb1/extconf.rb Sun Apr 27 05:35:25 2003
@@ -1,9 +1,10 @@
#!/usr/bin/ruby
require 'mkmf'
+require 'rbconfig'
-$stat_lib = if CONFIG.key?("LIBRUBYARG_STATIC")
+$stat_lib = if Config::CONFIG.key?("LIBRUBYARG_STATIC")
$LDFLAGS += " -L#{CONFIG['libdir']}"
- CONFIG["LIBRUBYARG_STATIC"]
+ Config::CONFIG["LIBRUBYARG_STATIC"]
else
"-lruby"
end
@@ -40,8 +41,7 @@
unknown: $(DLLIB)
\t@echo "main() {}" > /tmp/a.c
-\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) #$stat_lib #{CONFIG["LIBS"
-]} $(LIBS) $(LOCAL_LIBS)
+\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) #$stat_lib #{Config::CONFIG["LIBS"]} $(LIBS) $(LOCAL_LIBS)
\t@-rm /tmp/a.c a.out
test: $(DLLIB)

11
lang/ruby_static/files/ruby16-patch-ext+zlib+extconf.rb Normal file
View File

@ -0,0 +1,11 @@
--- ext/zlib/extconf.rb.orig Fri Mar 28 11:24:47 2003
+++ ext/zlib/extconf.rb Sun Apr 27 05:56:22 2003
@@ -24,7 +24,7 @@
oldlibs = $libs
oldlibpath = $LIBPATH
$libs += " " + Config::CONFIG['LIBRUBYARG']
- $LIBPATH = [$libdir, $archdir] | $LIBPATH
+ $LIBPATH = [$libdir, $archdir || Config::CONFIG["compile_dir"]] | $LIBPATH
begin
have_func s, 'ruby.h'
rescue ArgumentError # for ruby-1.4