* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gputils/, dev-embedded/gputils/files/
@ 2018-05-20 12:59 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2018-05-20 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 2b89b6d67d33d4362507574864d6ca811941d386
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 12:55:25 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 20 12:55:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b89b6d6
dev-embedded/gputils: Remove 0.13.7
Uses deprecated EAPI 2 and overshadowed by 1.5.0.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
dev-embedded/gputils/Manifest | 1 -
.../gputils/files/gputils-0.13.7-strncat.patch | 94 ----------------------
dev-embedded/gputils/gputils-0.13.7.ebuild | 26 ------
3 files changed, 121 deletions(-)
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 6095093be79..4e70dc3807a 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,4 +1,3 @@
-DIST gputils-0.13.7.tar.gz 2670129 BLAKE2B df1978105d679d930b5d1707b9db5b833baea83d196ae1861c08b89726bebafe9f14521233634561f5beb72cc05fc4670faeff4353e518b40877c63b85075303 SHA512 4133a0281c125abb964d2451bfff422444f9816ebb4c17dcc8faa88829e7a84d6cb542cfb9acda397ef9f14a1979644fbcf29aa489cdf94fb6e26c99b2ee901b
DIST gputils-0.14.0.tar.gz 2802791 BLAKE2B 34c5da263a3a3bc1e24b85e03c9169e8e563742583eb34becd62bd9934a44238ff41ac95cb7c05bc552ee2b23110c178c5e87db4adc929e85699a471bfa07d5b SHA512 ca50c95fc81043f8672db0d5101831de65a536ce8e5061aabedfa340f821bc7eb6db7bea6f8923b239167ed65a17b1fe7d32d40e10e69b92d351ba408535f1d4
DIST gputils-0.14.1.tar.gz 3233430 BLAKE2B 16e9442636f525c936f81a02537732833184100d120ec9bff509fa362fb48753f3fbfd33053504e48b1933a701cd4a00129ced77c740bb83bdfc667db765ff5d SHA512 e32b7628377390a491b3455a7c5c89cf29b8dd4928f450c879d4d9de4416536265198346ba5b5fad073ac03c33af879ab8acc0a6d6d4713d5ef8c3ea94a4c4dd
DIST gputils-0.14.2.tar.gz 3257391 BLAKE2B 61a837bc90dea10867070ddb6422657ea69f1bc8a7e8992174043db1d443841ad6573db81d29ed453f80b4a8a51956d75ae70e85dd2f1b24ae5779832e72caa9 SHA512 80e3d488a043e6915e297951190fec2dfb8d073bee793a64e2574aa6c88ad3c180f6e541b71c3dc8f5b844766236293b7c37abd1461593f5d827fdb84cf65a6c
diff --git a/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch b/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch
deleted file mode 100644
index 577a4bf0328..00000000000
--- a/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3081197&group_id=41924&atid=431665
-https://sourceforge.net/tracker/?func=detail&aid=3081206&group_id=41924&atid=431665
-
---- a/gpasm/scan.c
-+++ b/gpasm/scan.c
-@@ -461,9 +461,7 @@ search_pathes(struct source_context *new, char *name)
- int i;
-
- for(i = 0; i < state.path_num; i++) {
-- strncpy(tryname, state.paths[i], sizeof(tryname));
-- strncat(tryname, COPY_CHAR, sizeof(tryname));
-- strncat(tryname, name, sizeof(tryname));
-+ snprintf(tryname, sizeof(tryname), "%s%s%s", state.paths[i], COPY_CHAR, name);
- new->f = fopen(tryname, "rt");
- if(new->f) {
- new->name = strdup(tryname);
---- a/gplink/gplink.c
-+++ b/gplink/gplink.c
-@@ -340,9 +340,7 @@ void gplink_open_coff(char *name)
- int i;
-
- for(i = 0; i < state.numpaths; i++) {
-- strncpy(file_name, state.paths[i], sizeof(file_name));
-- strncat(file_name, COPY_CHAR, sizeof(file_name));
-- strncat(file_name, name, sizeof(file_name));
-+ snprintf(file_name, sizeof(file_name), "%s%s%s", state.paths[i], COPY_CHAR, name);
- coff = fopen(file_name, "rb");
- if (coff != NULL) {
- break;
-@@ -695,9 +693,7 @@ linker(void)
- gp_error("linker script not specified and can't determine default script");
- return EXIT_FAILURE;
- }
-- strncpy(file_name, gp_lkr_path, sizeof(file_name));
-- strncat(file_name, COPY_CHAR, sizeof(file_name));
-- strncat(file_name, script_name, sizeof(file_name));
-+ snprintf(file_name, sizeof(file_name), "%s%s%s", gp_lkr_path, COPY_CHAR, script_name);
- gp_message("using default linker script \"%s\"", file_name);
- open_src(file_name, 0);
- yyparse();
---- a/gplink/scan.c
-+++ b/gplink/scan.c
-@@ -115,9 +115,7 @@ void open_src(char *name, int isinclude)
- int i;
-
- for(i = 0; i < state.numpaths; i++) {
-- strncpy(tryname, state.paths[i], sizeof(tryname));
-- strncat(tryname, COPY_CHAR, sizeof(tryname));
-- strncat(tryname, name, sizeof(tryname));
-+ snprintf(tryname, sizeof(tryname), "%s%s%s", state.paths[i], COPY_CHAR, name);
- new->f = fopen(tryname, "rt");
- if(new->f) {
- new->name = strdup(tryname);
---- a/gpasm/lst.c
-+++ b/gpasm/lst.c
-@@ -149,22 +149,23 @@ void lst_memory_map(MemBlock *m)
- }
-
- if(row_used) {
-- snprintf(buf, sizeof(buf), "%08x :", (i + base) << _16bit_core);
-+ int len = sizeof(buf);
-+ len -= snprintf(buf, len, "%08x :", (i + base) << _16bit_core);
- for (j = 0; j < num_per_line; j++) {
- if ((j % num_per_block) == 0) {
-- strncat(buf, " ", sizeof(buf));
-+ strncat(buf, " ", len--);
- }
- if (m->memory[i + j] & MEM_USED_MASK) {
-- strncat(buf, "X", sizeof(buf));
-+ strncat(buf, "X", len--);
- if (_16bit_core) {
- /* each word has two bytes */
-- strncat(buf, "X", sizeof(buf));
-+ strncat(buf, "X", len--);
- }
- } else {
-- strncat(buf, "-", sizeof(buf));
-+ strncat(buf, "-", len--);
- if (_16bit_core) {
- /* each word has two bytes */
-- strncat(buf, "-", sizeof(buf));
-+ strncat(buf, "-", len--);
- }
- }
- }
-@@ -404,7 +405,7 @@ void lst_format_line(char *src_line, int value)
- } else {
- snprintf(buf, sizeof(buf), " M ");
- }
-- strncat(m, buf, sizeof(m));
-+ strncat(m, buf, sizeof(m) - strlen(m));
-
- /* Now copy 'l' to 'e', expanding tabs as required */
- {
diff --git a/dev-embedded/gputils/gputils-0.13.7.ebuild b/dev-embedded/gputils/gputils-0.13.7.ebuild
deleted file mode 100644
index 9d12d799263..00000000000
--- a/dev-embedded/gputils/gputils-0.13.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="http://gputils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-strncat.patch
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
- insinto /usr/share/doc/${PF}
- doins doc/gputils.pdf || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gputils/, dev-embedded/gputils/files/
@ 2018-05-20 12:59 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2018-05-20 12:59 UTC (permalink / raw
To: gentoo-commits
commit: b0a0afe7a3509e2eb3699fa9cf37278465cc5b5a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 12:54:11 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 20 12:54:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a0afe7
dev-embedded/gputils: Remove 0.13.6-r1
Uses deprecated EAPI 0 and overshadowed by 1.5.0.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
dev-embedded/gputils/Manifest | 1 -
.../gputils/files/gputils-0.13.6-code_pack.patch | 182 ---------------------
dev-embedded/gputils/gputils-0.13.6-r1.ebuild | 31 ----
3 files changed, 214 deletions(-)
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 4dc19cff7e4..6095093be79 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,4 +1,3 @@
-DIST gputils-0.13.6.tar.gz 2042890 BLAKE2B 234534c227c1a56a4a23ec27f3cf436ed3a5bad0860bbae008866294039f6d3543266a97a424dade4501e41a78f831d2092544f91923290d84e9726f8810b820 SHA512 e5227863c2f103db133102d526fd60d08f306f0ca8cf4b1f951616e8cf72264912394fa51375734c006d48bbe1adf8038347c35d8401f15ec5cfe906008f212d
DIST gputils-0.13.7.tar.gz 2670129 BLAKE2B df1978105d679d930b5d1707b9db5b833baea83d196ae1861c08b89726bebafe9f14521233634561f5beb72cc05fc4670faeff4353e518b40877c63b85075303 SHA512 4133a0281c125abb964d2451bfff422444f9816ebb4c17dcc8faa88829e7a84d6cb542cfb9acda397ef9f14a1979644fbcf29aa489cdf94fb6e26c99b2ee901b
DIST gputils-0.14.0.tar.gz 2802791 BLAKE2B 34c5da263a3a3bc1e24b85e03c9169e8e563742583eb34becd62bd9934a44238ff41ac95cb7c05bc552ee2b23110c178c5e87db4adc929e85699a471bfa07d5b SHA512 ca50c95fc81043f8672db0d5101831de65a536ce8e5061aabedfa340f821bc7eb6db7bea6f8923b239167ed65a17b1fe7d32d40e10e69b92d351ba408535f1d4
DIST gputils-0.14.1.tar.gz 3233430 BLAKE2B 16e9442636f525c936f81a02537732833184100d120ec9bff509fa362fb48753f3fbfd33053504e48b1933a701cd4a00129ced77c740bb83bdfc667db765ff5d SHA512 e32b7628377390a491b3455a7c5c89cf29b8dd4928f450c879d4d9de4416536265198346ba5b5fad073ac03c33af879ab8acc0a6d6d4713d5ef8c3ea94a4c4dd
diff --git a/dev-embedded/gputils/files/gputils-0.13.6-code_pack.patch b/dev-embedded/gputils/files/gputils-0.13.6-code_pack.patch
deleted file mode 100644
index f743ec343f6..00000000000
--- a/dev-embedded/gputils/files/gputils-0.13.6-code_pack.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Index: gpasm/lst.c
-===================================================================
---- gpasm/lst.c (revision 541)
-+++ gpasm/lst.c (revision 542)
-@@ -212,11 +212,75 @@
- }
- }
-
-+unsigned int lst_data(char *m, unsigned int byte_org,
-+ unsigned int bytes_emitted, size_t sizeof_m)
-+{
-+ char buf[BUFSIZ];
-+ unsigned int i;
-+ unsigned int lst_bytes = 0;
-+
-+ if ((byte_org & 1) != 0) {
-+ /* not word-aligned */
-+ /* list first byte */
-+ unsigned char emit_byte = (unsigned char)(i_memory_get(state.i_memory,
-+ (byte_org >> 1)) >> 8);
-+ snprintf(buf, sizeof(buf), "%02X", emit_byte);
-+ strncat(m, buf, sizeof_m);
-+ ++lst_bytes;
-+ /* list whole words */
-+ for (i = 0; (i < ((bytes_emitted-1) >> 1)) && (i < 1); ++i) {
-+ unsigned int emit_word = i_memory_get(state.i_memory,
-+ ((byte_org+1) >> 1) + i) & 0xffff;
-+ snprintf(buf, sizeof(buf), "%02X %02X", emit_word & 0x00ff,
-+ emit_word >> 8);
-+ strncat(m, buf, sizeof_m);
-+ lst_bytes += 2;
-+ }
-+ /* list extra byte if odd */
-+ if (((byte_org+bytes_emitted) & 1) != 0) {
-+ snprintf(buf, sizeof(buf), "%02X ", i_memory_get(state.i_memory,
-+ ((byte_org + bytes_emitted - 2) >> 1)) & 0x00ff);
-+ strncat(m, buf, sizeof_m);
-+ ++lst_bytes;
-+ }
-+ else {
-+ strncat(m, " ", sizeof_m);
-+ }
-+ }
-+ else { /* word-aligned */
-+ /* list full words as bytes */
-+ for (i = 0; (i < (bytes_emitted >> 1)) && (i < 2); ++i) {
-+ unsigned int emit_word = i_memory_get(state.i_memory,
-+ (byte_org>>1) + i) & 0xffff;
-+ snprintf(buf, sizeof(buf), "%04X ", emit_word);
-+ strncat(m, buf, sizeof_m);
-+ lst_bytes += 2;
-+ }
-+ if (bytes_emitted < 4) {
-+ /* list extra byte if odd */
-+ if (((byte_org+bytes_emitted) & 1) != 0) {
-+ snprintf(buf, sizeof(buf), "%02X ", i_memory_get(state.i_memory,
-+ (byte_org+bytes_emitted)>>1) & 0x00ff);
-+ strncat(m, buf, sizeof_m);
-+ ++lst_bytes;
-+ }
-+ else {
-+ strncat(m, " ", sizeof_m);
-+ }
-+ }
-+ }
-+
-+ return lst_bytes;
-+}
-+
- void lst_format_line(char *src_line, int value)
- {
- char m[BUFSIZ];
- char buf[BUFSIZ];
- unsigned int emitted = 0;
-+ unsigned int byte_org = 0;
-+ unsigned int bytes_emitted = 0;
-+ unsigned int lst_bytes;
-
- assert(src_line != NULL);
-
-@@ -239,41 +303,21 @@
- state.device.id_location + 1) & 0xffff);
- break;
- case insn:
-- emitted = state.org - state.lst.line.was_org
-- + (state.obj.section &&
-- state.obj.section->emitted_pack_byte ? 1 : 0);
-- snprintf(m, sizeof(m), "%04X ", (state.lst.line.was_org << _16bit_core)
-- - (state.obj.section &&
-- ((emitted == 0 &&
-- state.obj.section->have_pack_byte) ||
-- state.obj.section->emitted_pack_byte) ? 1 : 0));
-+ byte_org = (state.lst.line.was_org << 1);
-+ if (state.obj.section)
-+ byte_org -= (state.obj.section->emitted_pack_byte ? 1 : 0);
-+ bytes_emitted = (state.org << 1) - byte_org;
-+ if (state.obj.section)
-+ bytes_emitted -= (state.obj.section->have_pack_byte ? 1 : 0);
-+ emitted = (bytes_emitted >> 1);
-+ if (((byte_org & 1) == 0) && ((bytes_emitted & 1) != 0))
-+ emitted += 1;
-+ snprintf(m, sizeof(m), "%04X ", byte_org >> (1 - _16bit_core));
-
-- if (emitted >= 1) {
-- if(state.obj.section && state.obj.section->have_pack_byte && emitted == 1)
-- snprintf(buf, sizeof(buf), "%02X ", i_memory_get(state.i_memory, state.lst.line.was_org) & 0xff);
-- else if(state.obj.section && state.obj.section->emitted_pack_byte)
-- snprintf(buf, sizeof(buf), " %02X ", (i_memory_get(state.i_memory, state.lst.line.was_org - 1) & 0xff00) >> 8);
-- else
-- snprintf(buf, sizeof(buf), "%04X ", i_memory_get(state.i_memory,
-- state.lst.line.was_org) & 0xffff);
-+ lst_bytes = lst_data(m, byte_org, bytes_emitted, sizeof(m));
-+ byte_org += lst_bytes;
-+ bytes_emitted -= lst_bytes;
-
-- strncat(m, buf, sizeof(m));
-- } else
-- strncat(m, " ", sizeof(m));
--
-- if (emitted >= 2) {
-- if(state.obj.section && state.obj.section->have_pack_byte && emitted == 2)
-- snprintf(buf, sizeof(buf), "%02X ", i_memory_get(state.i_memory,
-- state.lst.line.was_org
-- + (state.obj.section->emitted_pack_byte ? 0 : 1)) & 0xffff);
-- else
-- snprintf(buf, sizeof(buf), "%04X ", i_memory_get(state.i_memory,
-- state.lst.line.was_org
-- + (state.obj.section &&
-- state.obj.section->emitted_pack_byte ? 0 : 1)) & 0xffff);
-- strncat(m, buf, sizeof(buf));
-- } else
-- strncat(m, " ", sizeof(m));
- break;
- case config:
- if(_16bit_core) {
-@@ -376,39 +420,16 @@
- lst_line(m);
- }
-
-- if (emitted > 2) {
-- int i;
-+ if (bytes_emitted > 0) {
-+ while (bytes_emitted > 0) {
-+ /* data left to print on separate lines */
-
-- for (i = 2; i < emitted; i += 2) {
-- unsigned int org = state.lst.line.was_org + i -
-- (state.obj.section && state.obj.section->emitted_pack_byte ? 1 : 0);
--
-- if ((i + 1) < emitted)
-- if(state.obj.section && state.obj.section->have_pack_byte)
-- snprintf(m, sizeof(m), "%04X %04X %02X ",
-- org << _16bit_core,
-- i_memory_get(state.i_memory, org) & 0xffff,
-- i_memory_get(state.i_memory, org + 1) & 0xff);
-- else
-- snprintf(m, sizeof(m), "%04X %04X %04X",
-- org << _16bit_core,
-- i_memory_get(state.i_memory, org) & 0xffff,
-- i_memory_get(state.i_memory, org + 1) & 0xffff);
-- else {
-- if(state.obj.section && state.obj.section->have_pack_byte)
-- snprintf(m, sizeof(m), "%04X %02X ",
-- ((state.lst.line.was_org + i) << _16bit_core),
-- i_memory_get(state.i_memory,
-- state.lst.line.was_org + i) & 0xff);
-- else
-- snprintf(m, sizeof(m), "%04X %04X",
-- ((state.lst.line.was_org + i) << _16bit_core),
-- i_memory_get(state.i_memory,
-- state.lst.line.was_org + i) & 0xffff);
-- }
-+ strncpy(m, " ", sizeof(m));
-+ lst_bytes = lst_data(m, byte_org, bytes_emitted, sizeof(m));
-+ byte_org += lst_bytes;
-+ bytes_emitted -= lst_bytes;
- lst_line(m);
- }
--
- state.cod.emitting = 0;
- }
-
diff --git a/dev-embedded/gputils/gputils-0.13.6-r1.ebuild b/dev-embedded/gputils/gputils-0.13.6-r1.ebuild
deleted file mode 100644
index 2e47afd1056..00000000000
--- a/dev-embedded/gputils/gputils-0.13.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="http://gputils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-code_pack.patch
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
- insinto /usr/share/doc/${PF}/
- doins doc/gputils.pdf
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gputils/, dev-embedded/gputils/files/
@ 2021-11-07 7:09 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-11-07 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 21ea66b26eea2572564d1de7ab047ab573c57d69
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 07:08:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 07:08:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ea66b2
dev-embedded/gputils: update EAPI 6 -> 8, respect *FLAGS (really disable gold)
Closes: https://bugs.gentoo.org/722648
Closes: https://bugs.gentoo.org/818802
Fixes: 3b63fda8bb810ac60d85ed7f7649c61906f72f98
Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org> (noticing bonehead change previously)
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gputils-1.5.0-respect-flags.patch | 123 +++++++++++++++++++++
dev-embedded/gputils/gputils-1.5.0.ebuild | 26 +++--
2 files changed, 141 insertions(+), 8 deletions(-)
diff --git a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
new file mode 100644
index 00000000000..01d13dedab0
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
@@ -0,0 +1,123 @@
+https://sourceforge.net/p/gputils/code/1288
+https://bugs.gentoo.org/722648
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,29 +160,41 @@
+ AC_CHECK_FUNCS(strndup, , [IBERTYOBJS="$IBERTYOBJS strndup.o"])
+ AC_CHECK_FUNCS(strverscmp, , [IBERTYOBJS="$IBERTYOBJS strverscmp.o"])
+
+-AM_CFLAGS=
++VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
++VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
++VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
++
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
++
++AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
++AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
++
++AM_CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
+ AM_LDFLAGS=
+
+ # Options for the system on which the package will run.
+ case "${host}" in
+ *cygwin* )
+ if test "x$GCC" = "xyes"; then
+- AM_CFLAGS="-Wall -pedantic"
++ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic"
+ AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+ fi
+ ;;
+ *darwin* )
+ if test "x$CC" = "xclang"; then
+- AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
++ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
+ fi
+ ;;
+ *linux* )
+ if test "x$CC" = "xclang"; then
+- AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
++ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
+ AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+ else
+ if test "x$GCC" = "xyes"; then
+- AM_CFLAGS="-Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
++ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
+ AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+ fi
+ fi
+@@ -192,33 +204,20 @@
+ *-pc-os2_emx | *-pc-os2-emx )
+ EXEEXT=".exe"
+ if test "x$GCC" = "xyes"; then
+- AM_CFLAGS="-Zcrtdll"
++ AM_CFLAGS="$AM_CFLAGS -Zcrtdll"
+ fi
+ ;;
+ *sun* )
+ # sunos cc needs the -xCC flag for // comments
+ if test "x$GCC" != "xyes"; then
+- AM_CFLAGS="-xCC"
++ AM_CFLAGS="$AM_CFLAGS -xCC"
+ fi
+ ;;
+ esac
+-
+-VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
+-VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
+-VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
+-
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
+-
+-AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
+-AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
+-CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
+
+ # Host filesystem options.
+ case "${host}" in
+- *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp*)
++ *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp* )
+ AC_DEFINE(HAVE_DOS_BASED_FILE_SYSTEM, 1,
+ [Define if your host uses a DOS based file system.])
+ ;;
+@@ -231,15 +230,13 @@
+ fi
+
+ if test x$enable_gdb_debuginfo = xyes; then
+- CFLAGS="$CFLAGS -ggdb"
++ AM_CFLAGS="$AM_CFLAGS -ggdb"
+ fi
+
+ if test x$enable_gputils_path = xyes; then
+ AC_DEFINE(USE_DEFAULT_PATHS, 1,
+ [Define if you want to add default search paths.])
+ fi
+-
+-LDFLAGS=
+
+ # Substitute configuration variables.
+ AC_SUBST(ENABLE_HTML_DOC)
+@@ -248,8 +245,6 @@
+ AC_SUBST(AM_PACKAGE_SVN_VERSION)
+ AC_SUBST(AM_CFLAGS)
+ AC_SUBST(AM_LDFLAGS)
+-AC_SUBST(CFLAGS)
+-AC_SUBST(LDFLAGS)
+ AC_SUBST(GPUTILS_HEADER_PATH)
+ AC_SUBST(GPUTILS_LKR_PATH)
+ AC_SUBST(GPUTILS_LIB_PATH)
+@@ -301,6 +296,7 @@
+ Source directory: $srcdir
+ Installation prefix: $prefix
+ C compiler: $CC $AM_CFLAGS $CFLAGS
++ C linker: $CC $AM_LDFLAGS
+ Location of MPLAB-X: $DEFAULT_MPLABX_PATH
+
+ ])
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
index 54b186ff608..651af5d9d70 100644
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
HOMEPAGE="https://gputils.sourceforge.io"
@@ -12,20 +12,30 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-src_configure() {
- # bug #818802
- tc-ld-is-gold && tc-ld-force-bfd
- #tc-ld-disable-gold #369291
+PATCHES=(
+ "${FILESDIR}/flags.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_compile() {
+ # bug #369291, bug #818802
+ tc-ld-disable-gold
# Their configure script tries to do funky things with default
# compiler selection. Force our own defaults instead.
tc-export CC
- default
+
+ econf
}
src_install() {
default
+
dodoc doc/gputils.pdf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gputils/, dev-embedded/gputils/files/
@ 2023-03-05 10:14 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-03-05 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 863177f86911eb2f217e4ddf793bcb7630f550f3
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Dec 1 18:25:11 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 10:14:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=863177f8
dev-embedded/gputils: Bump to 1.5.2
Closes: https://bugs.gentoo.org/833186
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-embedded/gputils/Manifest | 1 +
.../files/gputils-1.5.2-fix-invalid-operator.patch | 25 ++++++++++++
dev-embedded/gputils/gputils-1.5.2.ebuild | 47 ++++++++++++++++++++++
3 files changed, 73 insertions(+)
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 91bfb2d62d21..3b4ccf1b585b 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1 +1,2 @@
DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
+DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
diff --git a/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
new file mode 100644
index 000000000000..ec2d8d425832
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
@@ -0,0 +1,25 @@
+Fix invalid operator in dash
+
+Some shells, like dash, don't support [ x == x ], reporting invalid syntax,
+and silently failing.
+
+--- gputils-1.5.2.orig/doc/html-help/Makefile.am
++++ gputils-1.5.2/doc/html-help/Makefile.am
+@@ -7,7 +7,7 @@
+ pkgdatadir = @GPUTILS_HTMLDOC_PATH@
+
+ html-doc:
+- if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++ if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ if [ ! -e $(DEFAULT_MPLABX_PATH)/mpasmx/8bit_device.info ]; then \
+ @echo "Can't find mplabx installation; HTML documentation will not be built."; \
+ else \
+@@ -18,7 +18,7 @@
+ install: install-html
+
+ install-html:
+- if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++ if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ if [ -n "$$(ls *.html 2>/dev/null)" -a -n "$$(ls *.css 2>/dev/null)" ]; then \
+ $(install_sh) -d "$(DESTDIR)$(pkgdatadir)"; \
+ $(install_sh) -c -m 644 *.css *.html "$(DESTDIR)$(pkgdatadir)"; \
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
new file mode 100644
index 000000000000..11fb1036b9e4
--- /dev/null
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs flag-o-matic
+
+DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
+HOMEPAGE="https://gputils.sourceforge.io"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+PATCHES=(
+ "${FILESDIR}"/gputils-1.5.2-fix-invalid-operator.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # bug #369291, bug #818802
+ tc-ld-disable-gold
+
+ # Their configure script tries to do funky things with default
+ # compiler selection. Force our own defaults instead.
+ tc-export CC
+
+ # LTO currently causes various segfaults in dev-embedded/sdcc
+ # sys-devel/gcc-11.3.0 '-O3 -flto'
+ filter-flags '-flto*'
+
+ local myeconfargs=(
+ $(use_enable doc html-doc)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ use doc && dodoc doc/gputils.pdf
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-05 10:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-20 12:59 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/gputils/, dev-embedded/gputils/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2023-03-05 10:14 Viorel Munteanu
2021-11-07 7:09 Sam James
2018-05-20 12:59 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox