diff --git a/recipes/libs/libpcre2.yaml b/recipes/libs/libpcre2.yaml index 2e301980..a4505187 100644 --- a/recipes/libs/libpcre2.yaml +++ b/recipes/libs/libpcre2.yaml @@ -1,43 +1,38 @@ -inherit: [cmake] +inherit: [autotools] metaEnvironment: - PKG_VERSION: "10.47" + PKG_VERSION: "10.49" PKG_LICENSE: "BSD-3-Clause WITH PCRE2-exception" checkoutSCM: scm: url url: ${GITHUB_MIRROR}/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VERSION}/pcre2-${PKG_VERSION}.tar.bz2 - digestSHA256: 47fe8c99461250d42f89e6e8fdaeba9da057855d06eb7fc08d9ca03fd08d7bc7 + digestSHA256: 53c156e1ba416a20da8e65395daa132da0d80e76910424caca3fcdae7831d384 stripComponents: 1 buildScript: | - # CFLAGS="${CFLAGS:-} -fPIC" \ - # disabled tests and grep as they are not installed within the dev package - # making cmake unhappy when used: - # - # The imported target "pcre2::pcre2test" references the file - # /usr/bin/pcre2test - # - cmakeBuild $1 -DCMAKE_INSTALL_LIBDIR="lib" \ - -DPCRE2_SUPPORT_JIT=ON \ - -DPCRE2_BUILD_PCRE2GREP=OFF \ - -DPCRE2_BUILD_TESTS=OFF \ - -DPCRE2_BUILD_PCRE2_8=ON \ - -DPCRE2_BUILD_PCRE2_16=ON + autotoolsBuild $1 \ + --enable-jit \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --disable-pcre2grep-libz \ + --disable-pcre2grep-libbz2 \ + --disable-pcre2test-libedit \ + --disable-pcre2test-libreadline multiPackage: "": depends: - name: libs::libpcre2-tgt use: [] - packageScript: cmakePackageBin + packageScript: autotoolsPackageBin provideDeps: [ "*-tgt" ] dev: packageScript: | - cmakePackageDev + autotoolsPackageDev # install pcre2-config and fix it for bob usage mkdir -p usr/bin sed 's,prefix=/usr,prefix=$(dirname $0)/..,' $1/install/usr/bin/pcre2-config > usr/bin/pcre2-config chmod a+x usr/bin/pcre2-config tgt: - packageScript: cmakePackageTgt + packageScript: autotoolsPackageTgt diff --git a/recipes/utils/grep.yaml b/recipes/utils/grep.yaml index 572b37e3..27b4a2f6 100644 --- a/recipes/utils/grep.yaml +++ b/recipes/utils/grep.yaml @@ -1,24 +1,27 @@ inherit: [autotools] depends: - - libs::pcre-lib-1-dev + - libs::libpcre2-dev - use: [] depends: - - libs::pcre-lib-1-tgt + - libs::libpcre2-tgt metaEnvironment: - PKG_VERSION: "3.11" + PKG_VERSION: "3.12" PKG_LICENSE: "GPL-3.0-or-later" checkoutSCM: scm: url url: ${GNU_MIRROR}/grep/grep-${PKG_VERSION}.tar.xz - digestSHA1: "955146a0a4887eca33606e391481bbef37055b86" + digestSHA256: "2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9" stripComponents: 1 buildScript: | - autotoolsBuild $1 \ - --without-included-regex + # Skip tests and gnulib-tests. They are not installed, and gnulib's test + # helpers do not build on every platform. + SUBDIRS_OPT="SUBDIRS=po lib doc src" + autotoolsBuild -o "$SUBDIRS_OPT" -O "$SUBDIRS_OPT" $1 \ + --enable-perl-regexp packageScript: | autotoolsPackageTgt