v1.0.37

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c7859616956..278f0e650dac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = uclibc-ng
 	pkgdesc = A C library for embedded Linux
-	pkgver = 1.0.34
+	pkgver = 1.0.37
 	pkgrel = 1
 	url = https://uclibc-ng.org/
 	arch = x86_64
 	license = LGPL2.1
+	depends = linux-headers
 	options = staticlibs
-	source = https://downloads.uclibc-ng.org/releases/1.0.34/uClibc-ng-1.0.34.tar.xz
-	source = config
-	sha512sums = 65822e36f8fff7852af208c11f25cfc33b4b4bc7d90977ab83abf777f0ca5173afb01830f6752b6fb1d9ed35c91f312c4cb5cad967b4d5cdc7cd65f0ebaabe55
-	sha512sums = 0318e67ead594929f54dec56377465fe1877a996d81c0bfbc4537745fb8a54bbdeaca8b43fb1a3196dc4ab9e680cc787aa8599fd11dcf28808d404fd61b65fda
+	source = https://downloads.uclibc-ng.org/releases/1.0.37/uClibc-ng-1.0.37.tar.xz
+	sha512sums = e09cffe3462b292f1070a0ff92faef2a39e1f704b41c35c8fc71902ef335b8e357a58c35d1640481797df443b15c08d1e95dd0aa88b223158ab0850d67a2c771
 
 pkgname = uclibc-ng
 
diff --git a/PKGBUILD b/PKGBUILD
index 71ae81a9f0f4..c461a9c80ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 # Maintainer: Sean Anderson <seanga2@gmail.com>
 pkgname=uclibc-ng
-pkgver=1.0.34
+pkgver=1.0.37
 pkgrel=1
 epoch=
 pkgdesc="A C library for embedded Linux"
@@ -13,7 +13,7 @@ arch=(x86_64)
 url="https://uclibc-ng.org/"
 license=('LGPL2.1')
 groups=()
-depends=()
+depends=('linux-headers')
 makedepends=()
 checkdepends=()
 optdepends=()
@@ -26,15 +26,14 @@ install=
 changelog=
 source=(
 	"https://downloads.uclibc-ng.org/releases/$pkgver/uClibc-ng-$pkgver.tar.xz"
-	"config"
 )
 noextract=()
-sha512sums=('65822e36f8fff7852af208c11f25cfc33b4b4bc7d90977ab83abf777f0ca5173afb01830f6752b6fb1d9ed35c91f312c4cb5cad967b4d5cdc7cd65f0ebaabe55'
-            '0318e67ead594929f54dec56377465fe1877a996d81c0bfbc4537745fb8a54bbdeaca8b43fb1a3196dc4ab9e680cc787aa8599fd11dcf28808d404fd61b65fda')
+sha512sums=('e09cffe3462b292f1070a0ff92faef2a39e1f704b41c35c8fc71902ef335b8e357a58c35d1640481797df443b15c08d1e95dd0aa88b223158ab0850d67a2c771')
 
 prepare() {
 	cd "uClibc-ng-$pkgver"
-	cp "$srcdir"/config .config
+	ARCH=x86_64 make defconfig
+	sed -i 's,KERNEL_HEADERS.*,KERNEL_HEADERS="/usr/include/",g' .config
 }
 
 build() {
@@ -45,9 +44,4 @@ build() {
 package() {
 	cd "uClibc-ng-$pkgver"
 	make PREFIX="$pkgdir" install
-
-	# configure RUNTIME_PREFIX with /lib for PT_INTERP compat, but install to /usr/lib
-	mv "$pkgdir"/lib/ld64-uClibc*.so* "$pkgdir"/usr/lib/
-	mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/uClibc/lib/
-	rmdir "$pkgdir"/lib
 }