diff options
Diffstat (limited to 'sys-libs/libixp')
-rw-r--r-- | sys-libs/libixp/Manifest | 3 | ||||
-rw-r--r-- | sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch | 40 | ||||
-rw-r--r-- | sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild | 37 |
3 files changed, 58 insertions, 22 deletions
diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest index 7564783facb2..3d9267cbbe96 100644 --- a/sys-libs/libixp/Manifest +++ b/sys-libs/libixp/Manifest @@ -1,3 +1,4 @@ +AUX libixp-0.5_p20110208-gentoo.patch 807 BLAKE2B c264f6e532bf66c6f9b8ce31865b43e7cce9479c72ec5e0ed3b192fafd15890f2c32009046ff71a95ea9661c9372d6ec23dbfac509c2904f3693ed4fb6012ce7 SHA512 be06d9a41487a503117aaeda3ddc3b7f90538830b7e4bbe60d847b952616fa07d8fd4d4b4b9d0375ccc97f59939c8f868ec7d437a8331b94b35e3bdf967f0e23 DIST libixp-0.5_p20110208.tar.xz 655956 BLAKE2B 0c2195a3f793dab19bd08acd3758105f9bd4a57a8e1bcbac1f8fcdbba8e2ecd25280468019ef069810267246995e53a078835515effeb8a4f523c834ac0ef020 SHA512 c5cf13b54ab2fca66b6c0ace0f3067e46a461d62727e93235e60382d3665edd40751d404f3f590c9d7692a5b8cb7d1fefb05adb2c36d7941bf04e37d13a4a48a -EBUILD libixp-0.5_p20110208-r3.ebuild 1111 BLAKE2B 0bde380fdf1d6ad6a053368f3c50de23bffbae9294afdff1995158868759088afb7db9e46d3d205b7306bede9a8d4cbffa34c937ed64ff9a4705d91acae96974 SHA512 10b82ffdf90f4bcf27625c8441c40af0b25c92e6b2d43271f3bd345ec4366b486f9db5bac09ecf66a8aabcdd0d4c36cb1bcc301156a5991b45929d5251476527 +EBUILD libixp-0.5_p20110208-r3.ebuild 940 BLAKE2B 181531eea8973e9890e36d9bad2111b2f5de8da6893f1bc144b0c0551cd703b1441dc24e1a7d5086cbb3d61a5fc8c27483f59946df4100537e558d8351d784e9 SHA512 a3d83f912540ab771ed02e6528a33eb7b425c5b8f14ae70635801d8d969ae776a1dc16b3f2131230af7e0757fb5e99119f17911f64d2c062b14fdbd620cc2c47 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch b/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch new file mode 100644 index 000000000000..dbe101acef89 --- /dev/null +++ b/sys-libs/libixp/files/libixp-0.5_p20110208-gentoo.patch @@ -0,0 +1,40 @@ +--- a/cmd/ixpc.c ++++ b/cmd/ixpc.c +@@ -10,6 +10,8 @@ + #include <unistd.h> + #include <ixp_local.h> + ++char *argv0; ++ + /* Temporary */ + #define fatal(...) ixp_eprint("ixpc: fatal: " __VA_ARGS__); \ + +--- a/include/ixp.h ++++ b/include/ixp.h +@@ -66,13 +66,13 @@ + + typedef unsigned char uchar; + typedef uint16_t ushort; +-typedef uint32_t ulong; ++typedef unsigned long ulong; + typedef uint64_t uvlong; + + typedef int64_t vlong; + + # define respond ixp_respond +-# define serve_9pcon ixp_serve9pconn ++# define serve_9pcon ixp_serve9conn + #endif + + #undef uint +--- a/include/ixp_local.h ++++ b/include/ixp_local.h +@@ -12,7 +12,7 @@ + typedef char* va_list; + #endif + +-char *argv0; ++extern char *argv0; + #define ARGBEGIN \ + int _argtmp=0, _inargv=0; char *_argv=nil; \ + if(!argv0) {argv0=*argv; argv++, argc--;} \ diff --git a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild index 8c7dc645c040..bd8a54c6e054 100644 --- a/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild +++ b/sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# hg clone https://hg.suckless.org/libixp +EAPI=7 -EAPI=4 -inherit multilib toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A stand-alone client/server 9P library including ixpc client" HOMEPAGE="https://libs.suckless.org/deprecated/libixp" @@ -13,29 +12,25 @@ SRC_URI="mirror://gentoo/${P}.tar.xz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="" -RDEPEND="" -DEPEND="app-arch/xz-utils" +PATCHES=( + # https://code.google.com/p/libixp/issues/detail?id=2 + # https://code.google.com/p/wmii/issues/detail?id=247 + # https://bugs.gentoo.org/393299 + "${FILESDIR}"/${P}-gentoo.patch +) -pkg_setup() { +src_configure() { myixpconf=( - PREFIX="/usr" - LIBDIR="/usr/$(get_libdir)" + PREFIX="${EPREFIX}"/usr + LIBDIR="${EPREFIX}"/usr/$(get_libdir) + LIBS= CC="$(tc-getCC) -c" LD="$(tc-getCC) ${LDFLAGS}" AR="$(tc-getAR) crs" - MAKESO="1" + MAKESO=1 SOLDFLAGS="-shared" - ) -} - -src_prepare() { - # https://code.google.com/p/libixp/issues/detail?id=2 - sed -i -e 's:ixp_serve9pconn:ixp_serve9conn:' include/ixp.h || die - - # https://bugs.gentoo.org/393299 https://code.google.com/p/wmii/issues/detail?id=247 - sed -i -e '69s:uint32_t:unsigned long:' include/ixp.h || die + ) } src_compile() { @@ -45,5 +40,5 @@ src_compile() { src_install() { emake "${myixpconf[@]}" DESTDIR="${D}" install dolib.so lib/libixp{,_pthread}.so - dodoc NEWS + einstalldocs } |