diff options
Diffstat (limited to 'app-emulation/coldfire')
-rw-r--r-- | app-emulation/coldfire/Manifest | 4 | ||||
-rw-r--r-- | app-emulation/coldfire/coldfire-0.3.1.ebuild | 16 | ||||
-rw-r--r-- | app-emulation/coldfire/files/coldfire-0.3.1-ld.patch | 11 | ||||
-rw-r--r-- | app-emulation/coldfire/files/coldfire-0.3.1-no-common.patch | 23 |
4 files changed, 50 insertions, 4 deletions
diff --git a/app-emulation/coldfire/Manifest b/app-emulation/coldfire/Manifest index 6c830117a5ba..c787b3399457 100644 --- a/app-emulation/coldfire/Manifest +++ b/app-emulation/coldfire/Manifest @@ -1,5 +1,7 @@ AUX coldfire-0.3.1-build.patch 693 BLAKE2B 0b9ff6d289ea6e67403b895d7f85986601777473b75742bd44898739117be6697ea5785d25a1102f3994dfcaa003f1041f511df45f11050d5cb0c67bb9589cc8 SHA512 1999aa892c62f2ae98062bcd7711f0d120e7ba3fe7b812b236c82f9ecbe48654cc3782e5384a2d57c0e3d503e0df638f2d9efbbd8345becd36959ba1c54d456d AUX coldfire-0.3.1-headers.patch 386 BLAKE2B 8b4dd43d49064e9abb9c22685aaac946cf703988303337f206b8975c27d840d0f97b06c68cd11b877da77ed5cfbc9a1e0a1776d39c1db54fa8e501c6b7ffe11e SHA512 5a9c4aa70891421cdff2ef16a49c67483c95e95a88af2a26412e1a6d5161a2cef328a81f891560ede52126eb3b01a3285553e0673fe9e44ae659a35cad701a1d +AUX coldfire-0.3.1-ld.patch 207 BLAKE2B aa11471d386356030b2463e7546907a106af40bfaa5a046bc6f6e21b8e0a4ad1d15e029ac3d4676c88480dcf5fd0adc44840bda0a2fc61ce69e9e453039867f8 SHA512 8a405dff2b14e8ab9cf17af1f6a7308e85e96d2ecb93cbc31ebfb82ab74e8175062f1d8d7ef6d11c0fe7fcd81cff8b069f866d7ed968f436256830c5d5e45bca +AUX coldfire-0.3.1-no-common.patch 1011 BLAKE2B 44d766a9631dfd8168c012e01273d260a3c37bda817a953272e0988bb7f58dfc94da36b2ab959c2cba00be8f72b227e85b8e82e763d99e82822b3cdec2b9d6aa SHA512 14de4fb101ab7bf770f64837165e754701ad8e69ec0f403b1318df91ae1f71845ae9c09dfc0cec5f7633764e2229c7b05c758f8e89f24cbb36e1dddc4c1b7969 DIST coldfire-0.3.1.tar.gz 142964 BLAKE2B b2ec1d9a46b09426caada3cf2216e1aad6eadfc2756c7ea47236f6cebb51b2d09faf6d1e30af240656bc4ec876f425b049e6971e5ab532ceae66b4d80ab41585 SHA512 e9ac6fcd4a9a8cf0998a658c786f91f6d97dbe03cd32fdc7047c87baa14d412a45dfdd233f68e3136e8d0f36c4d6dd556e5df6e8a0645f82d4abf88fa574ff7b -EBUILD coldfire-0.3.1.ebuild 520 BLAKE2B 4cf2d90103c27adf07cf668304e0987c1431b6503b016575fd87fd91c420e52baeee8903089fe3e50dbc8abc9c90cb6924a1f0639075374a2fcb933d6d8672f9 SHA512 7f1a7142e1a9d5b4bf1bcc2a37ad3a18ad147b8dca566ffb74f87eb387462ac19240f6ab7b0bd15698dc16298903425e961eb8f7de2e8f1fc63d3c0a2b6cc91a +EBUILD coldfire-0.3.1.ebuild 650 BLAKE2B 79e979aa0803b568baa2e7fa8cc5297f0ee87f6ca5fa92e3a521122eec68e750e15f61a7da7f58230fae728f816b5a2a63fcd653d9c15f1f1bcb176981571bc8 SHA512 95931036a7855b62de1b12b03fcb913a13ac1c3890db387c0712c99f0272eea8a221a9209b838f1330bae0feb2fb6f389135bd717cf9ac9962c123a25f0c5244 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e diff --git a/app-emulation/coldfire/coldfire-0.3.1.ebuild b/app-emulation/coldfire/coldfire-0.3.1.ebuild index 21e971272979..653abff711e4 100644 --- a/app-emulation/coldfire/coldfire-0.3.1.ebuild +++ b/app-emulation/coldfire/coldfire-0.3.1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Motorola Coldfire Emulator" HOMEPAGE="http://www.slicer.ca/coldfire/" SRC_URI="http://www.slicer.ca/coldfire/files/${P}.tar.gz" @@ -16,10 +18,18 @@ DEPEND="sys-libs/ncurses:0= sys-libs/readline:0=" PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-headers.patch + "${FILESDIR}"/${P}-ld.patch + "${FILESDIR}"/${P}-no-common.patch ) +src_prepare() { + default + + tc-export LD +} + src_install() { dobin coldfire dodoc CONTRIBUTORS HACKING README diff --git a/app-emulation/coldfire/files/coldfire-0.3.1-ld.patch b/app-emulation/coldfire/files/coldfire-0.3.1-ld.patch new file mode 100644 index 000000000000..b0b16fec8603 --- /dev/null +++ b/app-emulation/coldfire/files/coldfire-0.3.1-ld.patch @@ -0,0 +1,11 @@ +--- a/Makefile.rules.in ++++ b/Makefile.rules.in +@@ -1,7 +1,7 @@ + CC = @CC@ + CFLAGS = -Wall @CPPFLAGS@ @CFLAGS@ -I$(TOPSRCDIR) + LIBS = @LIBS@ +-LD_R = ld -r ++LD_R = $(LD) -r + RM = rm -f + LDFLAGS = @LDFLAGS@ + diff --git a/app-emulation/coldfire/files/coldfire-0.3.1-no-common.patch b/app-emulation/coldfire/files/coldfire-0.3.1-no-common.patch new file mode 100644 index 000000000000..f4cc61f7bb46 --- /dev/null +++ b/app-emulation/coldfire/files/coldfire-0.3.1-no-common.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/706942 +--- a/peripherals/sim_5206.c ++++ b/peripherals/sim_5206.c +@@ -23,7 +23,7 @@ static struct _sim_register *sim_register_lookup_by_offset(s32 offset); + static struct _sim_register *sim_register_lookup_by_name(char *name); + static void sim_interrupt_assert(s16 number, s16 vector); + static void sim_interrupt_withdraw(s16 number); +-struct _sim sim_data; ++static struct _sim sim_data; + + /* name, offset, width, read, write, resetvalue, description */ + static struct _sim_register sim_reg[] = { +--- a/peripherals/sim_5307.c ++++ b/peripherals/sim_5307.c +@@ -59,7 +59,7 @@ static struct _sim_register *sim_register_lookup_by_offset(s32 offset); + static struct _sim_register *sim_register_lookup_by_name(char *name); + static void sim_interrupt_assert(s16 number, s16 vector); + static void sim_interrupt_withdraw(s16 number); +-struct _sim sim_data; ++static struct _sim sim_data; + + /* name, offset, width, read, write, resetvalue, description */ + static struct _sim_register sim_reg[] = { |