You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
lang/ruby19 .. 23: fix build error or missing openssl.bundle at ext/openssl
closes https://trac.macports.org/ticket/63845 keep PKG_CONFIG_PATH in Makefile and use it at running `miniruby extconf.rb`. ruby(1.8) does not use pkg-config in ext/openssl when headers and libraries are found from "--with-openssl-include" and "--with-openssl-lib".
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
PortSystem 1.0
|
||||
PortGroup select 1.0
|
||||
PortGroup openssl 1.0
|
||||
PortGroup deprecated 1.0
|
||||
|
||||
# Reached EOL on 2019-03-31
|
||||
@@ -9,7 +10,7 @@ deprecated.upstream_support no
|
||||
|
||||
name ruby23
|
||||
version 2.3.8
|
||||
revision 9
|
||||
revision 10
|
||||
|
||||
categories lang ruby
|
||||
maintainers {kimuraw @kimuraw} openmaintainer
|
||||
@@ -37,11 +38,11 @@ checksums md5 78045332e298dfd859ceef9fe946950f \
|
||||
use_parallel_build no
|
||||
|
||||
depends_lib port:readline \
|
||||
port:openssl10 \
|
||||
port:zlib \
|
||||
port:libyaml \
|
||||
port:libffi \
|
||||
port:gdbm
|
||||
openssl.branch 1.0
|
||||
depends_run port:ruby_select
|
||||
depends_build port:pkgconfig
|
||||
depends_skip_archcheck pkgconfig
|
||||
@@ -57,6 +58,8 @@ patchfiles-append patch-tiger.diff
|
||||
# from RUBY_ARCH and RUBY_PLATFORM in config.h
|
||||
# https://trac.macports.org/ticket/58255
|
||||
patchfiles-append patch-configure_cxx11.diff
|
||||
# Fix pkg-config in ext/openssl
|
||||
patchfiles-append patch-openssl_pkgconfig.diff
|
||||
|
||||
# replace old config.{guess,sub} with recent versions from automake
|
||||
depends_build-append port:automake
|
||||
@@ -74,8 +77,8 @@ configure.args --enable-shared \
|
||||
--without-tk \
|
||||
--without-gmp \
|
||||
--with-opt-dir="${prefix}" \
|
||||
--with-openssl-include=${prefix}/include/openssl-1.0 \
|
||||
--with-openssl-lib=${prefix}/lib/openssl-1.0 \
|
||||
--with-openssl-include=[openssl::include_dir] \
|
||||
--with-openssl-lib=[openssl::lib_dir] \
|
||||
--program-suffix=2.3 \
|
||||
--with-rubylibprefix="${prefix}/lib/ruby2.3"
|
||||
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
diff -ur ../ruby-2.3.8.org/Makefile.in ./Makefile.in
|
||||
--- ../ruby-2.3.8.org/Makefile.in 2018-03-28 14:30:24.000000000 +0900
|
||||
+++ ./Makefile.in 2021-11-09 18:27:20.000000000 +0900
|
||||
@@ -88,6 +88,9 @@
|
||||
BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
|
||||
POSTLINK = @POSTLINK@
|
||||
|
||||
+PKG_CONFIG = @PKG_CONFIG@
|
||||
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
+
|
||||
RUBY_BASE_NAME=@RUBY_BASE_NAME@
|
||||
RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
|
||||
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
||||
diff -ur ../ruby-2.3.8.org/common.mk ./common.mk
|
||||
--- ../ruby-2.3.8.org/common.mk 2018-03-28 14:30:24.000000000 +0900
|
||||
+++ ./common.mk 2021-11-09 19:23:32.000000000 +0900
|
||||
@@ -195,7 +195,8 @@
|
||||
EXTS_MK = exts.mk
|
||||
$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
|
||||
$(ECHO) generating makefile $@
|
||||
- $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
|
||||
+ $(Q) PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
|
||||
+ $(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
|
||||
|
||||
configure-ext: $(EXTS_MK)
|
||||
|
||||
diff -ur ../ruby-2.3.8.org/configure ./configure
|
||||
--- ../ruby-2.3.8.org/configure 2018-10-18 00:37:54.000000000 +0900
|
||||
+++ ./configure 2021-11-09 19:26:19.000000000 +0900
|
||||
@@ -773,6 +773,7 @@
|
||||
CP
|
||||
RM
|
||||
PKG_CONFIG
|
||||
+PKG_CONFIG_PATH
|
||||
PYTHON
|
||||
DOXYGEN
|
||||
DOT
|
||||
@@ -953,7 +954,8 @@
|
||||
CXX
|
||||
CXXFLAGS
|
||||
CCC
|
||||
-CPP'
|
||||
+CPP
|
||||
+PKG_CONFIG_PATH'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
Reference in New Issue
Block a user