| 1 |
caleb 09/03/28 23:36:45 |
| 2 |
|
| 3 |
Added: IceRuby-3.3.1-Makefile.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
(Portage version: 2.1.6.9/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: IceRuby-3.3.1-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
--- ruby/Makefile.orig 2007-03-13 08:31:21.000000000 -0400 |
| 17 |
+++ ruby/Makefile 2007-03-13 08:31:50.000000000 -0400 |
| 18 |
@@ -128,8 +128,8 @@ |
| 19 |
@echo "Installing generated code" |
| 20 |
@for i in $(MODULES) ; \ |
| 21 |
do \ |
| 22 |
- $(INSTALL_DATA) $${i}.rb $(install_rubydir) ; \ |
| 23 |
- $(INSTALL_DATA) -r $$i $(install_rubydir) ; \ |
| 24 |
+ $(INSTALL_DATA) $${i}.rb $(install_rubylibdir) ; \ |
| 25 |
+ $(INSTALL_DATA) -r $$i $(install_rubylibdir) ; \ |
| 26 |
done |
| 27 |
|
| 28 |
clean:: |
| 29 |
--- src/IceRuby/Makefile.orig 2007-03-13 08:31:58.000000000 -0400 |
| 30 |
+++ src/IceRuby/Makefile 2007-03-13 08:35:59.000000000 -0400 |
| 31 |
@@ -48,6 +48,6 @@ |
| 32 |
ln -s $(SONAME) $@ |
| 33 |
|
| 34 |
install:: all |
| 35 |
- $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) |
| 36 |
+ $(call installlib,$(install_rubyarchdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) |
| 37 |
|
| 38 |
include .depend |
| 39 |
--- config/Make.rules.orig 2008-04-02 13:13:25.000000000 -0400 |
| 40 |
+++ config/Make.rules 2008-04-02 13:15:14.000000000 -0400 |
| 41 |
@@ -12,13 +12,13 @@ |
| 42 |
# if it does not exist. |
| 43 |
# |
| 44 |
|
| 45 |
-prefix ?= /opt/Ice-$(VERSION) |
| 46 |
+prefix ?= $(DESTDIR)/usr |
| 47 |
|
| 48 |
# |
| 49 |
# The "root directory" for runpath embedded in executables. Can be unset |
| 50 |
# to avoid adding a runpath to Ice executables. |
| 51 |
# |
| 52 |
-embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
| 53 |
+#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
| 54 |
|
| 55 |
# |
| 56 |
# Define OPTIMIZE as yes if you want to build with optimization. |
| 57 |
@@ -45,8 +45,10 @@ |
| 58 |
RUBY = ruby |
| 59 |
endif |
| 60 |
|
| 61 |
-RUBY_INCLUDE_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")') |
| 62 |
-RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(libdir)")') |
| 63 |
+RUBY_ARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")') |
| 64 |
+RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(rubylibdir)")') |
| 65 |
+RUBY_SITEARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitearchdir)")') |
| 66 |
+RUBY_SITELIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitelibdir)")') |
| 67 |
|
| 68 |
RUBY_SHARED = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::MAKEFILE_CONFIG["ENABLE_SHARED"]') |
| 69 |
|
| 70 |
@@ -56,7 +58,7 @@ |
| 71 |
RUBY_LIB = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)-static")') |
| 72 |
endif |
| 73 |
|
| 74 |
-RUBY_FLAGS = -I$(RUBY_INCLUDE_DIR) |
| 75 |
+RUBY_FLAGS = -I$(RUBY_ARCH_DIR) |
| 76 |
RUBY_LIBS = -L$(RUBY_LIB_DIR) $(RUBY_LIB) |
| 77 |
|
| 78 |
# ---------------------------------------------------------------------- |
| 79 |
@@ -77,8 +79,8 @@ |
| 80 |
endif |
| 81 |
|
| 82 |
libdir = $(top_srcdir)/ruby |
| 83 |
-install_rubydir = $(prefix)/ruby |
| 84 |
-install_libdir = $(prefix)/ruby |
| 85 |
+install_rubylibdir = $(DESTDIR)/$(RUBY_SITELIB_DIR) |
| 86 |
+install_rubyarchdir = $(DESTDIR)/$(RUBY_SITELIB_DIR) |
| 87 |
|
| 88 |
# |
| 89 |
# Platform specific definitions |
| 90 |
--- Makefile.orig 2008-04-23 09:17:07.000000000 -0400 |
| 91 |
+++ Makefile 2008-04-23 09:17:27.000000000 -0400 |
| 92 |
@@ -13,11 +13,11 @@ |
| 93 |
|
| 94 |
SUBDIRS = src ruby |
| 95 |
|
| 96 |
-install:: install-common |
| 97 |
- @if test ! -d $(install_rubydir) ; \ |
| 98 |
+install:: |
| 99 |
+ @if test ! -d $(install_rubylibdir) ; \ |
| 100 |
then \ |
| 101 |
- echo "Creating $(install_rubydir)..." ; \ |
| 102 |
- $(call mkdir,$(install_rubydir)) ; \ |
| 103 |
+ echo "Creating $(install_rubylibdir)..." ; \ |
| 104 |
+ mkdir -p $(install_rubylibdir) ; \ |
| 105 |
fi |
| 106 |
|
| 107 |
$(EVERYTHING):: |
Archives