diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2003-07-31 22:16:01 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2003-07-31 22:16:01 +0000 |
| commit | 57b5c30e65871d3c9b40ae6686b5e0a127f87fed (patch) | |
| tree | 18f23f46ae8f3791cbf4d7b830686a8f1b55655c /lang | |
| parent | - Update to 0.25: allows generating diffs (diff) | |
Load rbconfig.rb before referring to Config and unbreak.
Notes
Notes:
svn path=/head/; revision=86088
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby16_static/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby16_static/files/patch-ext+bdb1+extconf.rb | 25 | ||||
| -rw-r--r-- | lang/ruby_static/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby_static/files/patch-ext+bdb1+extconf.rb | 25 |
4 files changed, 4 insertions, 52 deletions
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile index e9670bebc1f0..40ef1786be21 100644 --- a/lang/ruby16_static/Makefile +++ b/lang/ruby16_static/Makefile @@ -81,10 +81,11 @@ PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} do-fetch: @${DO_NADA} -.if defined(STATIC) post-patch: +.if defined(STATIC) ${RUBY} -i -pe 'gsub /-rdynamic/, "-static"' ${WRKSRC}/configure.in .endif + ${RUBY} -i -pe '$$. == 1 and puts %q/require "rbconfig.rb"/' ${WRKSRC}/ext/bdb1/extconf.rb do-extract: ${MKDIR} ${WRKDIR} diff --git a/lang/ruby16_static/files/patch-ext+bdb1+extconf.rb b/lang/ruby16_static/files/patch-ext+bdb1+extconf.rb deleted file mode 100644 index b49410f5700c..000000000000 --- a/lang/ruby16_static/files/patch-ext+bdb1+extconf.rb +++ /dev/null @@ -1,25 +0,0 @@ ---- 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) diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile index e9670bebc1f0..40ef1786be21 100644 --- a/lang/ruby_static/Makefile +++ b/lang/ruby_static/Makefile @@ -81,10 +81,11 @@ PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} do-fetch: @${DO_NADA} -.if defined(STATIC) post-patch: +.if defined(STATIC) ${RUBY} -i -pe 'gsub /-rdynamic/, "-static"' ${WRKSRC}/configure.in .endif + ${RUBY} -i -pe '$$. == 1 and puts %q/require "rbconfig.rb"/' ${WRKSRC}/ext/bdb1/extconf.rb do-extract: ${MKDIR} ${WRKDIR} diff --git a/lang/ruby_static/files/patch-ext+bdb1+extconf.rb b/lang/ruby_static/files/patch-ext+bdb1+extconf.rb deleted file mode 100644 index b49410f5700c..000000000000 --- a/lang/ruby_static/files/patch-ext+bdb1+extconf.rb +++ /dev/null @@ -1,25 +0,0 @@ ---- 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) |