From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 May 2021 19:55:43 +0100 Subject: gentoo resync : 11.05.2021 --- sys-devel/remake/Manifest | 5 +- .../remake/files/remake-4.3.1.1.5-fno-common.patch | 103 +++++++++++++++++++++ sys-devel/remake/metadata.xml | 15 +-- sys-devel/remake/remake-4.3.1.1.5.ebuild | 40 ++++++++ 4 files changed, 155 insertions(+), 8 deletions(-) create mode 100644 sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch create mode 100644 sys-devel/remake/remake-4.3.1.1.5.ebuild (limited to 'sys-devel/remake') diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest index e872845ddf17..07fead4d6651 100644 --- a/sys-devel/remake/Manifest +++ b/sys-devel/remake/Manifest @@ -1,5 +1,8 @@ AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4 AUX remake-4.2.1.1.4-fno-common.patch 3096 BLAKE2B ca1fb0cd2382d1507239135f0aa2fe4c0d02414abd5c008a89ddae68d65589a8fc7244acfb7cf4881b3a44754208fbf05e54c8da2bc7317213b4bfa6ea4d4cfe SHA512 0d0751958e466bb2c40bff5b58d08a105e8b9c6884c02c05d93309f6014371f4ab0e2a3c38dd10cd73ecb3143076828d770031ea6c9aee63f945c15aa85774f3 +AUX remake-4.3.1.1.5-fno-common.patch 2988 BLAKE2B c9d6a4adef35cc51a82b5e625771bede0a13cbca4dfe40483497a9a2bfa6ac0f66c47023ec2d75075cd7c7abde7ccf1bb5eba315bad052ab3d7ac6c263c6ac09 SHA512 509096e2cfa1daefc1a7fd9b69355f21c6fcaf2adf4572bd6742ebb61b5d7ac65c0d8bbc0576c6bb2b3e895bac97d51f1da3008ae15b50e487aa09fe118d8b7a DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1 +DIST remake-4.3+dbg-1.5.tar.gz 2546056 BLAKE2B c5c1b254d0533e0d9787d408f79e8aba93cab5185de76519dabef7ddca5c9d2021671099f9ff80df345732552f859ce31d1131b89cd56fb185bae4cee676b412 SHA512 90aa9674ed5d88b72fda5a99a103d0b1a643d10b18c1de1186478b026f6b4da73628bff75a180df880157b5cbfff1bfd782f4ee81880e0635d79113fcc0f7497 EBUILD remake-4.2.1.1.4-r1.ebuild 959 BLAKE2B 483247fef4339d53a5ef98d4d5529930204106bfd49ea2e293d31df4ad45ad21999d3b3ec05bddd8b02f438267c52bcf313e4fb11a6c72d0a4ffd646ab6bc792 SHA512 406017f4e2136046ffcea1b102652a28fb01bc895cdf749e19fea61d0d1b09824018bb10d8f050d9bd9cb8c09f4dd0e6a82cd5be60d520343cedaf7a84b7e21b -MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c +EBUILD remake-4.3.1.1.5.ebuild 1088 BLAKE2B 2296a7387ef1f58edcfb59713a7bde883c5ef90f4d3bc4aa6bc5e734ff5918a9df8ebae05e1aae347dabd9cca57fcda02dd61f02631cad142486cbbf4c3c1da8 SHA512 25c38c7b9ce836645533bfe36221b9a5a91e13ae4417a7422390deaf8bb0b5370724c6b3ed015425987c236728b71112a448a978f3c942298e7b1865f1c64f72 +MISC metadata.xml 385 BLAKE2B 8f18b741478f60b3d1ef14fe838e948c04d4266d6aa9e1a5155754a0f86c5cf2f92f9768b96af1e3c47c6f7227d7e546d6c68d9e4b69c42f94bcc65d58d2a91c SHA512 b06a7454d4520da85e422a33ee320a82670796b74010840d077ac972124a3a971555f66d472b67a245dfaf6c2f74226a6a6bac64dc57889ab4e0e2c0d12f33ef diff --git a/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch b/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch new file mode 100644 index 000000000000..6c8650472e4e --- /dev/null +++ b/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch @@ -0,0 +1,103 @@ +Adapted version of https://github.com/rocky/remake/commit/08113a28b9be25cf157ace5d63c2d36d7dbefc04 +--- a/src/debugger/file2line.c ++++ b/src/debugger/file2line.c +@@ -26,6 +26,8 @@ Boston, MA 02111-1307, USA. */ + #include "../src/rule.h" + #include "./file2line.h" + ++struct hash_table file2lines; ++ + unsigned long + file2lines_hash_1 (const void *key) + { +--- a/src/debugger/file2line.h ++++ b/src/debugger/file2line.h +@@ -19,15 +19,15 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + #ifndef REMAKE_FILE2LINE + #define REMAKE_FILE2LINE +-struct hash_table file2lines; ++extern struct hash_table file2lines; + + typedef enum { + F2L_TARGET, + F2L_PATTERN + } f2l_entry_t; + +- +-typedef struct lineo_array_s ++ ++typedef struct lineo_array_s + { + const char *hname; /**< Name stored in hash table */ + unsigned int size; /**< Number of entries in array */ +@@ -40,13 +40,13 @@ typedef struct lineo_array_s + only. So we do this on demand. + */ + extern bool file2lines_init(void); +-extern file_t *target_for_file_and_line (const char *psz_filename, ++extern file_t *target_for_file_and_line (const char *psz_filename, + unsigned int lineno, + /*out*/ f2l_entry_t *entry_type); + extern void file2lines_dump(void); + #endif + +-/* ++/* + * Local variables: + * eval: (c-set-style "gnu") + * indent-tabs-mode: nil +--- a/src/dep.h ++++ b/src/dep.h +@@ -139,7 +139,7 @@ struct dep *copy_dep_chain (const struct dep *d); + struct goaldep *read_all_makefiles (const char **makefiles); + + /*! The chain of makefiles read by read_makefile. */ +-struct goaldep *read_makefiles; ++extern struct goaldep *read_makefiles; + + void eval_buffer (char *buffer, const gmk_floc *floc); + enum update_status update_goal_chain (struct goaldep *goals); +--- a/src/globals.h ++++ b/src/globals.h +@@ -89,6 +89,6 @@ extern int in_debugger; + extern bool b_debugger_preread; + + /* Remember the original value of the SHELL variable, from the environment. */ +-struct variable shell_var; ++extern struct variable shell_var; + + #endif /*GLOBALS_H*/ +--- a/src/main.c ++++ b/src/main.c +@@ -45,6 +45,8 @@ this program. If not, see . */ + # include + #endif + ++struct goaldep *read_makefiles; ++ + extern void initialize_stopchar_map (); + + #if defined HAVE_WAITPID || defined HAVE_WAIT3 +--- a/src/make.h ++++ b/src/make.h +@@ -324,7 +324,7 @@ extern int unixy_shell; + #endif + #ifdef SET_STACK_SIZE + # include +-struct rlimit stack_limit; ++extern struct rlimit stack_limit; + #endif + + /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use +--- a/src/print.h ++++ b/src/print.h +@@ -39,7 +39,7 @@ void fatal_err (target_stack_node_t *p_call, const char *fmt, ...); + + /* Think of the below not as an enumeration but as #defines done in a + way that we'll be able to use the value in a gdb. */ +-enum debug_print_enums_e { ++extern enum debug_print_enums_e { + MAX_STACK_SHOW = 1000, + } debug_print_enums1; + diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml index ab51d946705e..64318925643e 100644 --- a/sys-devel/remake/metadata.xml +++ b/sys-devel/remake/metadata.xml @@ -1,11 +1,12 @@ - - base-system@gentoo.org - Gentoo Base System - - - bashdb - + + base-system@gentoo.org + Gentoo Base System + + + rocky/remake + bashdb + diff --git a/sys-devel/remake/remake-4.3.1.1.5.ebuild b/sys-devel/remake/remake-4.3.1.1.5.ebuild new file mode 100644 index 000000000000..ae495601e9a2 --- /dev/null +++ b/sys-devel/remake/remake-4.3.1.1.5.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_MAKE_BASE=$(ver_cut 1-2) +MY_REMAKE_PATCH=$(ver_cut 4-) +MY_P="${PN}-${MY_MAKE_BASE}+dbg-${MY_REMAKE_PATCH}" + +DESCRIPTION="Patched version of GNU Make with improved error reporting, tracing, and debugging" +HOMEPAGE="http://bashdb.sourceforge.net/remake/" +SRC_URI="https://github.com/rocky/remake/releases/download/release_${MY_P/remake-/}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="guile readline" + +DEPEND="readline? ( sys-libs/readline:0= )" +RDEPEND="${DEPEND} + guile? ( >=dev-scheme/guile-1.8:= )" +BDEPEND="guile? ( >=dev-scheme/guile-1.8 )" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch +) + +src_configure() { + use readline || export vl_cv_lib_readline=no + econf $(use_with guile) +} + +src_install() { + default + + # delete files GNU make owns and remake doesn't care about. + rm -r "${ED}"/usr/include || die + rm "${ED}"/usr/share/info/make.info* || die +} -- cgit v1.2.3