diff options
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index 313e752222..fde67e9407 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc | |||
| @@ -20,7 +20,8 @@ DEPENDS_class-native = "openssl-native libyaml-native" | |||
| 20 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 20 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
| 21 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ | 21 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ |
| 22 | file://extmk.patch \ | 22 | file://extmk.patch \ |
| 23 | " | 23 | file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ |
| 24 | " | ||
| 24 | 25 | ||
| 25 | inherit autotools | 26 | inherit autotools |
| 26 | 27 | ||
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch new file mode 100644 index 0000000000..b0114ba28b --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From 306e95a9818d39d3349075aac9609e062b0f19ce Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Christopher Larson <chris_larson@mentor.com> | ||
| 5 | Date: Thu, 5 May 2016 10:59:07 -0700 | ||
| 6 | Subject: [PATCH 2/2] Obey LDFLAGS for the link of libruby | ||
| 7 | |||
| 8 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
| 9 | --- | ||
| 10 | Makefile.in | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/Makefile.in b/Makefile.in | ||
| 14 | index 7da2488..5b4aea1 100644 | ||
| 15 | --- a/Makefile.in | ||
| 16 | +++ b/Makefile.in | ||
| 17 | @@ -75,7 +75,7 @@ EXTLIBS = | ||
| 18 | LIBS = @LIBS@ $(EXTLIBS) | ||
| 19 | MISSING = @LIBOBJS@ @ALLOCA@ | ||
| 20 | LDSHARED = @LIBRUBY_LDSHARED@ | ||
| 21 | -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) | ||
| 22 | +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) | ||
| 23 | SOLIBS = @SOLIBS@ | ||
| 24 | MAINLIBS = @MAINLIBS@ | ||
| 25 | ARCHMINIOBJS = @MINIOBJS@ | ||
| 26 | -- | ||
| 27 | 2.8.0 | ||
| 28 | |||
