diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-19 19:01:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-19 19:01:00 +0000 |
| commit | 60945053af0588a6219a4a6867aace9e7b47faeb (patch) | |
| tree | 01b47053786c26a3e31ca562d46dfd252fe22cd7 /sci-electronics/puff | |
| parent | 26f79803004cb53e92cf2f0e889de89979385aa9 (diff) | |
gentoo auto-resync : 19:11:2022 - 19:01:00
Diffstat (limited to 'sci-electronics/puff')
| -rw-r--r-- | sci-electronics/puff/Manifest | 4 | ||||
| -rw-r--r-- | sci-electronics/puff/files/puff-20181104-Makefile.patch | 5 | ||||
| -rw-r--r-- | sci-electronics/puff/puff-20181104.ebuild | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/sci-electronics/puff/Manifest b/sci-electronics/puff/Manifest index 6c593e64b576..39aa1271f999 100644 --- a/sci-electronics/puff/Manifest +++ b/sci-electronics/puff/Manifest @@ -1,7 +1,7 @@ AUX puff-20100127-Makefile.patch 597 BLAKE2B 92a36f8db91336f7f6ec7ad99e366bda848cb80f75c8a43dac6fd1c50ae86483eccd1f5281fa16e954410ce8f9c04753aebd1711e9828b2df7562907a36f7faa SHA512 92831a435af24352027ee3f698eb8b5c651e736c937021732107915280cf9364039a5014dbdc3e25d52e8f85ba118bfae245d97e8ce053ddb434914b97c3e850 -AUX puff-20181104-Makefile.patch 630 BLAKE2B 4b82553375931c58baad49f60fef3fce0e38ba25302ce79d6af802076672c3237e7a10146b86c41353dfc9ae6edab4b3dc16376eb305bef692543ba0ab4aec51 SHA512 b49fb848122ef177c9152c38054806f6ea602799a07626d1233c9809ad2e4e6d9295592f096126b50bd0bf18c2ffe868e8153cb89fbc7b19d63931884a47d198 +AUX puff-20181104-Makefile.patch 676 BLAKE2B 1480d65da9c57df73d192aae9585ecc061ccf86474da0f860ac384ebd653f27f1851b81af9d0d0e5735f7b704493984a3e79e0f0e139f133b2935b6dea26f5ba SHA512 02c8915aa9f894b2c478f1b5d7bf13ff419bd7a0442fdba0e88ff0f69790004a809f94c3340acc2d76417b36c4238d0411f6d3b4e537fac259ed723c0fcc49fe DIST puff-20100127.tgz 430028 BLAKE2B e3c019c4034f4f70c3f1a2468360a8838ee338ec167b8da9ef6ec630d6443c66e798e22e6e2b80f6d706191756831aa3fa5146170e0bdb2cebe3cfcf13f6cd99 SHA512 d39d74300a5f6d226dcd6147f3c63cf30396abd14d765b24b48dbd1956c81a10d4233c141789648423aa44631197e1ec160630f9b20b6ac5ae641ae67cdcb2da DIST puff-20181104.tgz 430096 BLAKE2B f87bd2d93ff83271fbac9b2933b87dbbd47aa032e5662a77d77e58563a1e353b302f295520895b1a705c28a146ebf080fc5b66d17737a7c1d6fa48d320d3fb70 SHA512 44ffc132f2ecf92868129a98ae9d154a62232c670bfd139de6bee7f03c2ad3531068f8738f26a0074d169097945436e4630bf795c006354f335d41efa5aaa881 EBUILD puff-20100127-r1.ebuild 986 BLAKE2B 48007106aa3b545ab45becb063fc622dc56ee2bad3311a62f150329e09bf7fbce9751ce834813cfec78a403ad4e7385b36397b6889b04cb547238ce59c444704 SHA512 345246a1f1a89ee343a3afcca2d9190c24cd94abd8cb21f5b6b09cdf4d0c335c9a42ac1d748e3e2c23c5d5416416c587b614ff6a0bb30b76964fe7e934cda0a7 -EBUILD puff-20181104.ebuild 986 BLAKE2B 48007106aa3b545ab45becb063fc622dc56ee2bad3311a62f150329e09bf7fbce9751ce834813cfec78a403ad4e7385b36397b6889b04cb547238ce59c444704 SHA512 345246a1f1a89ee343a3afcca2d9190c24cd94abd8cb21f5b6b09cdf4d0c335c9a42ac1d748e3e2c23c5d5416416c587b614ff6a0bb30b76964fe7e934cda0a7 +EBUILD puff-20181104.ebuild 1328 BLAKE2B 4fddb04646261758e4aa7bfc077bc5d84389ad761b4d2ba0caaea4493d751d45299d1db076aca19c8573895833029bee3337547b0dc253ee7f51cc689a2c62f9 SHA512 f0fae40aa5b71f27698feca73b5f9d38fa0abd574fa5b4ba2f4db16696dd1943c78d2f978c655aed94e3f7052d6a134cc43b77a521654c1e8c6c23aecdd25426 MISC metadata.xml 379 BLAKE2B 42fdaffa2b09b25eb67aa2143014ab4eef4a3c8e8f08ca7a92a73b455fbcfbdd7e58386946f64f63333cab91d85beea9d6cc36e4a665ce65f50ee8cff421b79e SHA512 ad03cba2779d2fc2fe4ea93960ce5f4b2ba53c2ff315f5b643f9c42a216a4ac5efd35b658183ae494f56354bdb9309cdddadc3d105cf2494364c945271d70c32 diff --git a/sci-electronics/puff/files/puff-20181104-Makefile.patch b/sci-electronics/puff/files/puff-20181104-Makefile.patch index a874b9173aed..c51c87d1d33b 100644 --- a/sci-electronics/puff/files/puff-20181104-Makefile.patch +++ b/sci-electronics/puff/files/puff-20181104-Makefile.patch @@ -2,7 +2,7 @@ # respect CC and LD --- Makefile.old 2021-07-03 16:34:49.937098627 +0200 +++ Makefile 2021-07-03 16:33:56.615284555 +0200 -@@ -1,12 +1,13 @@ +@@ -1,12 +1,14 @@ X11LIBDIR = /usr/X11R6/lib PASCALCOMPILER = fpc -CC = gcc @@ -15,7 +15,8 @@ puff: $(POBJS) puff_c.o ppas.sh - sed 's/link.res/link.res puff_c.o -lX11/' <ppas.sh >ppasx.sh + sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh -+ sed 's/.res/.res $(LDFLAGS) puff_c.o -lX11/' <ppas.sh >ppasx.sh ++ sed -i -e 's/\-b [^[:space:]]\+//g' ppas.sh ++ sed 's:.res:.res $(LDFLAGS) puff_c.o -lX11:' <ppas.sh >ppasx.sh sh ppasx.sh %.o: %.pas diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild index 3ec8bccda1fa..80838dd3c7ef 100644 --- a/sci-electronics/puff/puff-20181104.ebuild +++ b/sci-electronics/puff/puff-20181104.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,11 +21,18 @@ src_prepare() { default # fix lib path for X11 and dont ignore LDFLAGS # respect CC and LD + # additional drop explicite format option for linker (bug #831569) eapply -p0 "${FILESDIR}"/$P-Makefile.patch + # add missing LDPATH for libX11.so + sed -i -e "s:-lX11:-L/usr/$(get_libdir) -lX11:g" Makefile || die + # drop no longer needed and now unsupported paramter '-T' (bug #8802225) + sed -i -e "s: -T : :g" Makefile || die eapply_user } src_compile() { +# # fails to compile with -flto (bug #862516) + filter-lto LDFLAGS="$(raw-ldflags)" emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" } |