diff --git a/libapr.yaml b/libapr.yaml new file mode 100644 index 00000000000..1cd379370c0 --- /dev/null +++ b/libapr.yaml @@ -0,0 +1,68 @@ +package: + name: libapr + version: 1.7.4 + epoch: 0 + description: "Apache Portable Runtime Library (APR)" + copyright: + - license: Apache-2.0 + +environment: + contents: + packages: + - wolfi-base + - busybox + - ca-certificates-bundle + - build-base + - elfutils-dev + - linux-headers + - zstd-dev + - zlib-dev + - automake + - autoconf + - python3 + - libtool + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/apache/apr + tag: ${{package.version}} + expected-commit: 22867ddac49b7dcf356556577461231acdff6445 + + - uses: patch + with: + patches: apr-1.7.2-autoconf-2.72.patch + + - runs: | + ./buildconf + + - uses: autoconf/configure + with: + opts: | + --prefix=/usr \ + --libdir=/usr/lib + + - uses: autoconf/make + + - uses: autoconf/make-install + + - runs: | + mkdir -p "${{targets.destdir}}"/usr/share/ + mv "${{targets.destdir}}"/usr/build-1 "${{targets.destdir}}"/usr/share/ + + - uses: strip + +subpackages: + - name: "libapr-dev" + description: "headers for libapr" + pipeline: + - uses: split/dev + dependencies: + runtime: + - libapr + +update: + enabled: false + github: + identifier: apache/apr + use-tag: true diff --git a/libapr/apr-1.7.2-autoconf-2.72.patch b/libapr/apr-1.7.2-autoconf-2.72.patch new file mode 100644 index 00000000000..689e2fa082d --- /dev/null +++ b/libapr/apr-1.7.2-autoconf-2.72.patch @@ -0,0 +1,22 @@ +https://src.fedoraproject.org/rpms/apr/raw/rawhide/f/apr-1.7.2-autoconf.patch + +Similar to https://github.com/apache/apr/commit/a15958a37a06f71c42c690278f9c958b93b7ee20. +--- a/build/apr_common.m4 ++++ b/build/apr_common.m4 +@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + fi + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( +- [ +-#ifndef PACKAGE_NAME +-#include "confdefs.h" +-#endif +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] ++ [[$1]], + [[$2]] +- [ return 0; }] + )], [CFLAGS=$apr_save_CFLAGS + $3], [CFLAGS=$apr_save_CFLAGS + $4]) \ No newline at end of file diff --git a/packages.txt b/packages.txt index 376aef2eb30..dbc269a8a3b 100644 --- a/packages.txt +++ b/packages.txt @@ -714,3 +714,4 @@ newrelic-prometheus-configurator prometheus-nats-exporter docker-credential-gcr kyverno +libapr