Fix packaging on i386

Found the hard way by sthen@

OK sthen@
This commit is contained in:
jeremy 2022-01-06 23:37:39 +00:00
parent 0792c234ad
commit 2274c89879
2 changed files with 17 additions and 13 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2022/01/04 19:46:40 jeremy Exp $
# $OpenBSD: Makefile,v 1.2 2022/01/06 23:37:39 jeremy Exp $
VERSION = 3.1.0
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby31 0.0
NEXTVER = 3.2
PKGSPEC-main ?= ruby->=3.1.0,<${NEXTVER}
REVISION-main = 0
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
@ -25,6 +26,9 @@ INSTALL_TARGET += install-doc
# Fix path for JIT compiler to not use shims in ports obj bin dir
CONFIGURE_ENV += ac_cv_path_MJIT_CC=`which ${CC}`
GEM_EXTENSIONS_DIR = lib/ruby/gems/${REV}/extensions/${MACHINE_ARCH:S/i386/x86/:S/amd64/x86_64/}-openbsd
SUBST_VARS += GEM_EXTENSIONS_DIR
WANTLIB-main += curses yaml-0
post-extract:

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2022/01/04 19:46:43 jeremy Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2022/01/06 23:37:39 jeremy Exp $
@option no-default-conflict
@option is-branch
@conflict ruby->=3.1,<3.2
@ -1516,17 +1516,17 @@ lib/ruby/gems/${REV}/cache/test-unit-3.5.3.gem
lib/ruby/gems/${REV}/cache/typeprof-0.21.1.gem
lib/ruby/gems/${REV}/doc/
lib/ruby/gems/${REV}/extensions/
lib/ruby/gems/${REV}/extensions/${SUB}/
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/debug-1.4.0/
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/debug-1.4.0/debug/
@so lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/debug-1.4.0/debug/debug.so
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/debug-1.4.0/gem.build_complete
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/debug-1.4.0/gem_make.out
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/rbs-2.0.0/
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/rbs-2.0.0/gem.build_complete
lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/rbs-2.0.0/gem_make.out
@so lib/ruby/gems/${REV}/extensions/${SUB}/${REV}/rbs-2.0.0/rbs_extension.so
${GEM_EXTENSIONS_DIR}/
${GEM_EXTENSIONS_DIR}/${REV}/
${GEM_EXTENSIONS_DIR}/${REV}/debug-1.4.0/
${GEM_EXTENSIONS_DIR}/${REV}/debug-1.4.0/debug/
@so ${GEM_EXTENSIONS_DIR}/${REV}/debug-1.4.0/debug/debug.so
${GEM_EXTENSIONS_DIR}/${REV}/debug-1.4.0/gem.build_complete
${GEM_EXTENSIONS_DIR}/${REV}/debug-1.4.0/gem_make.out
${GEM_EXTENSIONS_DIR}/${REV}/rbs-2.0.0/
${GEM_EXTENSIONS_DIR}/${REV}/rbs-2.0.0/gem.build_complete
${GEM_EXTENSIONS_DIR}/${REV}/rbs-2.0.0/gem_make.out
@so ${GEM_EXTENSIONS_DIR}/${REV}/rbs-2.0.0/rbs_extension.so
lib/ruby/gems/${REV}/gems/
lib/ruby/gems/${REV}/gems/abbrev-0.1.0/
lib/ruby/gems/${REV}/gems/base64-0.1.1/