diff options
| author | Narrat | 2024-02-23 22:48:33 +0100 |
|---|---|---|
| committer | Narrat | 2024-02-23 22:49:48 +0100 |
| commit | 4e49db01d1974bc65a989d82da52b40c5ef9ff94 (patch) | |
| tree | 4ab3071cf7e9c6cb992115acc56ef4fab1f306f5 | |
| parent | fddae42777a7fd7724eedba9fe9de39d99dbb171 (diff) | |
| download | aur-4e49db01d1974bc65a989d82da52b40c5ef9ff94.tar.gz | |
monkey: fix build
add patch which adjusts the include dir.
And add the configure step again in package(). If that is omitted it will install the files into /usr/local
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-fix_include.patch | 16 | ||||
| -rw-r--r-- | PKGBUILD | 26 |
3 files changed, 42 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = monkey pkgdesc = Lightweight and powerful web server pkgver = 1.7.3 - pkgrel = 1 + pkgrel = 2 url = https://github.com/monkey/monkey arch = i686 arch = x86_64 @@ -10,6 +10,8 @@ pkgbase = monkey depends = mbedtls options = !emptydirs source = monkey-1.7.3.tar.gz::https://github.com/monkey/monkey/archive/refs/tags/v1.7.3.tar.gz + source = 0001-fix_include.patch sha1sums = 3ffb76235aec734188fbc41f97ef661cf05cf9ab + sha1sums = 9346e0c2ad44a9019e461b42f4a2ab860584236a pkgname = monkey diff --git a/0001-fix_include.patch b/0001-fix_include.patch new file mode 100644 index 000000000000..a5d657a33684 --- /dev/null +++ b/0001-fix_include.patch @@ -0,0 +1,16 @@ +--- a/monkey-1.7.3/include/CMakeLists.txt ++++ b/monkey-1.7.3/include/CMakeLists.txt +@@ -1,10 +1,10 @@ + # MK_CORE + if(NOT WITHOUT_HEADERS) +- install(FILES "mk_core.h" ++ install(FILES "monkey/mk_core.h" + DESTINATION include/ + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +- file(GLOB headers "mk_core/*.h") ++ file(GLOB headers "monkey/mk_core/*.h") + install(FILES ${headers} + DESTINATION include/mk_core + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + @@ -2,7 +2,7 @@ pkgname=monkey pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight and powerful web server' url='https://github.com/monkey/monkey' arch=('i686' 'x86_64') @@ -10,10 +10,18 @@ license=('Apache') depends=('mbedtls') makedepends=('cmake') options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz") -sha1sums=('3ffb76235aec734188fbc41f97ef661cf05cf9ab') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" + 0001-fix_include.patch) +sha1sums=('3ffb76235aec734188fbc41f97ef661cf05cf9ab' + '9346e0c2ad44a9019e461b42f4a2ab860584236a') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Fix include dir (not include/, but include/monkey/) + patch -Np2 -i "${srcdir}"/0001-fix_include.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" mkdir build @@ -34,6 +42,18 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --malloc-libc \ + --mbedtls-shared \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --includedir=/usr/include \ + --sysconfdir=/etc/monkey \ + --webroot=/srv/http \ + --default-port=80 \ + --default-user=http + make CMAKE_COMMAND="/usr/bin/cmake" RM="/usr/bin/cmake" CMAKE_SOURCE_DIR="." CMAKE_BINARY_DIR="." DESTDIR="${pkgdir}" install rm -fr "${pkgdir}"/srv/http } |