public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [cygport - the Cygwin packaging tool] branch master, updated. 0.36.4
@ 2023-05-04 13:26 Jon Turney
0 siblings, 0 replies; only message in thread
From: Jon Turney @ 2023-05-04 13:26 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=54ffb9dc059ca8fb5056d2b85c52c4f3600ad930
commit 54ffb9dc059ca8fb5056d2b85c52c4f3600ad930
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue May 2 18:27:29 2023 +0100
Bump version to 0.36.4
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=63808e02fc1d5e254d475152e8b63e2835f8fdde
commit 63808e02fc1d5e254d475152e8b63e2835f8fdde
Author: Daisuke Fujimura <booleanlabel@gmail.com>
Date: Tue May 2 14:54:43 2023 +0100
rubygem: Supply 'gem install' bindir relative to build-root
If the `--build-root` option is specified for the `gem` command, the
value of the `--bindir` option must be a relative path.
https://github.com/rubygems/rubygems/blob/v3.4.12/lib/rubygems/installer.rb#L678-L679
Fixes: 18bd795f82d3 ("ruby, rubygem: update for Ruby 2.6 and RubyGems 3.0")
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=45719c9c32d883b1246aea72bced46fd56da1740
commit 45719c9c32d883b1246aea72bced46fd56da1740
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue May 2 14:51:03 2023 +0100
rubygem: Make errors from 'gem build' and 'gem install' fatal
Diff:
---
NEWS | 3 +++
cygclass/rubygem.cygclass | 6 +++---
cygport.spec | 2 +-
data/sample.cygport | 2 +-
meson.build | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index 03c58f8c..83c39008 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.36.4:
+ * rubygem: Make 'gem build|install' errors fatal, and fix bindir.
+
0.36.3:
* Add automatic determination of the appropriate rub_xy requirement
diff --git a/cygclass/rubygem.cygclass b/cygclass/rubygem.cygclass
index 13d7b1c5..c5ab37f8 100644
--- a/cygclass/rubygem.cygclass
+++ b/cygclass/rubygem.cygclass
@@ -112,7 +112,7 @@ RUBYGEM_EXTDIR=$(${RUBY} -e 'print Gem.default_dirs[:system][:ext_dir]')/ruby/${
# prepares it for installation.
#****
rubygem_compile() {
- gem build ${RUBYGEM_NAME}.gemspec
+ gem build ${RUBYGEM_NAME}.gemspec || error "gem build failed"
}
#****I* rubygem.cygclass/rubygem_install
@@ -132,8 +132,8 @@ rubygem_install() {
#****
CONFIGURE_ARGS="--with-cflags='${CFLAGS} -fdebug-prefix-map=${D}${RUBYGEM_INSTDIR}=/usr/src/debug/${NAME}-${VERSION}-${RELEASE}' $RUBYGEM_CONFIGURE_ARGS $@" \
gem install -V --local --ignore-dependencies --document=rdoc,ri \
- --build-root ${D} --install-dir ${RUBYGEM_DIR} --bindir ${D}$(__host_prefix)/bin \
- ${RUBYGEM_NAME}-${VERSION}.gem
+ --build-root ${D} --install-dir ${RUBYGEM_DIR} --bindir $(__host_prefix)/bin \
+ ${RUBYGEM_NAME}-${VERSION}.gem || error "gem install failed"
# used later to clean up RUBYGEM_INSTDIR
gem spec ${RUBYGEM_NAME}-${VERSION}.gem files --yaml \
diff --git a/cygport.spec b/cygport.spec
index bfa77fbf..803ccb50 100644
--- a/cygport.spec
+++ b/cygport.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: cygport
-Version: 0.36.3
+Version: 0.36.4
Release: 1%{?dist}
Summary: Cygwin package building tool
diff --git a/data/sample.cygport b/data/sample.cygport
index f6b85b19..56495ccb 100644
--- a/data/sample.cygport
+++ b/data/sample.cygport
@@ -1,7 +1,7 @@
inherit meson
NAME="cygport"
-VERSION=0.36.3
+VERSION=0.36.4
RELEASE=1
CATEGORY="Devel"
SUMMARY="Cygwin source packaging tool"
diff --git a/meson.build b/meson.build
index e7ef4a39..417a4ae5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('cygport',
- version: '0.36.3')
+ version: '0.36.4')
bindir = join_paths(get_option('prefix'), get_option('bindir'))
datadir = join_paths(get_option('prefix'), get_option('datadir'))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-04 13:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-04 13:26 [cygport - the Cygwin packaging tool] branch master, updated. 0.36.4 Jon Turney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).