Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

main/curl: fix missing static library symbols #6264

Closed
wants to merge 2 commits into from
Closed

main/curl: fix missing static library symbols #6264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b294c1
main/curl: fix missing static library symbols
j8r Feb 8, 2019
a3b5142
Add curl-static
j8r Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions main/curl/APKBUILD
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ depends="ca-certificates"
depends_dev="openssl-dev libssh2-dev nghttp2-dev zlib-dev"
checkdepends="python2"
makedepends="$depends_dev autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
subpackages="$pkgname-static $pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz"
builddir="$srcdir/$pkgname-$pkgver"

Expand Down Expand Up @@ -82,7 +82,7 @@ builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
autoreconf -vif
./configure \
./configure LDFLAGS=-static PKG_CONFIG='pkg-config --static' \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this will enforce static linking of curl itself. I don't mind that we ship a static library of curl in a subpackage, but we will not build curl static for all of our users.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No? I got:

ldd usr/bin/curl
        /lib/ld-musl-x86_64.so.1 (0x7f9c22c9d000)
        libssl.so.1.1 => /lib/libssl.so.1.1 (0x7f9c22b70000)
        libcrypto.so.1.1 => /lib/libcrypto.so.1.1 (0x7f9c228f2000)
        libz.so.1 => /lib/libz.so.1 (0x7f9c226db000)
        libc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7f9c22c9d000)

--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
Expand Down Expand Up @@ -114,4 +114,10 @@ libcurl() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
}

static() {
pkgdesc="Curl static library"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}

sha512sums="1629ba154691bf9d936e0bce69ec8fb54991a40d34bc16ffdfb117f91e3faa93164154fc9ae9043e963955862e69515018673b7239f2fd625684a59cdd1db81c curl-7.64.1.tar.xz"