sqlite3 1.5.2-arm-linux → 1.5.3-arm-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1829cf9ccdd7524878079df875e29611593b267372f07635b4c91c5f78f403ee
-  data.tar.gz: 4b4073a65bb12a23d06e1985b2f09742c47f588e5872374354db7e263fd3735e
+  metadata.gz: e4a79d25373b2d1b006db3e5ef654113e6f541866c374d9fefa3b3c6cb61771b
+  data.tar.gz: fac807d08830d8a265c41496651e429226d47bc1fe50ad881fc4deb43bbd42b9
 SHA512:
-  metadata.gz: 1fccdebe123798fdcb831998c7b33a138375bc2364ce2eb3332b9e1ce0cbf02623da65606c74153c1a523d288eb1e6cae103b3218dd9ee6fec06bceb25257be3
-  data.tar.gz: dd0c88a563ba39e168f276aaab6a5640e2d4ab0a933114ea149537e7c8d7c3ab7e55665f77977dfd2ad4f9e8a4951848e3c5d9a0004252bc15e087c73ba1c006
+  metadata.gz: f368297c961070aaf722f7ec162aba3ab691c1f62c1b77675e5032e41e8505bd8e4b5d92c8b847c1955cef62ffdd08026145d9ab6c18f0c862922d120f2ec1c3
+  data.tar.gz: 63b1ee44778eec8dad68ef58ea3f785fc486c5417c9e6ea7c8f695e6adf3e063e5cf1376e48361695dfe682862d65e08affc7a4a74b0fe463069c39b5e476a1a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # sqlite3-ruby Changelog
 
+## 1.5.3 / 2022-10-11
+
+### Fixed
+
+* Fixed installation of the "ruby" platform gem when building from source on Fedora. In v1.5.0..v1.5.2, installation failed on some systems due to the behavior of Fedora's pkg-config implementation. [#355]
+
+
 ## 1.5.2 / 2022-10-01
 
 ### Packaging

data/CONTRIBUTING.md

@@ -20,5 +20,5 @@ A quick checklist:
 - [ ] update `CHANGELOG.md` and `lib/sqlite3/version.rb` including `VersionProxy::{MINOR,TINY}`
 - [ ] create a git tag using a format that matches the pattern `v\d+\.\d+\.\d+`, e.g. `v1.3.13`
 - [ ] run `bin/build-gems` and make sure it completes and all the tests pass
-- [ ] `for g in gems/*.gem ; do gem push $g ; done`s
+- [ ] `for g in gems/*.gem ; do gem push $g ; done`
 - [ ] create a release at https://github.com/sparklemotion/sqlite3-ruby/releases and include sha2 checksums

data/ext/sqlite3/extconf.rb

@@ -66,15 +66,24 @@ module Sqlite3
           end
           recipe.activate
 
-          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t" # on macos, pkg-config will not return --cflags without this
-          pcfile = File.join(recipe.path, "lib", "pkgconfig", "sqlite3.pc")
-          if pkg_config(pcfile)
-            # see https://bugs.ruby-lang.org/issues/18490
-            libs = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
-            libs.split.each { |lib| append_ldflags(lib) } if $?.success?
-          else
-            abort("\nCould not configure the build properly. Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+          # on macos, pkg-config will not return --cflags without this
+          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
+
+          lib_path = File.join(recipe.path, "lib")
+          pcfile = File.join(lib_path, "pkgconfig", "sqlite3.pc")
+          abort_pkg_config("pkg_config") unless pkg_config(pcfile)
+
+          # see https://bugs.ruby-lang.org/issues/18490
+          flags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
+          abort_pkg_config("xpopen") unless $?.success?
+          flags = flags.split
+
+          # see https://github.com/flavorjones/mini_portile/issues/118
+          "-L#{lib_path}".tap do |lib_path_flag|
+            flags.prepend(lib_path_flag) unless flags.include?(lib_path_flag)
           end
+
+          flags.each { |flag| append_ldflags(flag) }
         end
       end
 
@@ -140,6 +149,10 @@ module Sqlite3
         abort("\nCould not find #{missing}.\nPlease visit https://github.com/sparklemotion/sqlite3-ruby for installation instructions.\n\n")
       end
 
+      def abort_pkg_config(id)
+        abort("\nCould not configure the build properly (#{id}). Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+      end
+
       def cross_build?
         enable_config("cross-build")
       end

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: arm-linux
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest