diff --git a/dev-embedded/cc65/ChangeLog b/dev-embedded/cc65/ChangeLog index d9b1de0f..47f39802 100644 --- a/dev-embedded/cc65/ChangeLog +++ b/dev-embedded/cc65/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Nov 2010; Mario Fetka -cc65-2.13.1.ebuild, + -cc65-2.13.2.ebuild, +cc65-2.13.2-r1.ebuild, + +files/cc65-2.13.2-asneeded-1.patch: + add repsect cflags & ldflags + 09 May 2010; Mario Fetka +cc65-2.13.2.ebuild, -cc65-2.13.9.20100106.ebuild: Bump diff --git a/dev-embedded/cc65/Manifest b/dev-embedded/cc65/Manifest index 8e2651ed..a0839f26 100644 --- a/dev-embedded/cc65/Manifest +++ b/dev-embedded/cc65/Manifest @@ -1,10 +1,7 @@ -AUX cc65-2.12.0-asneeded-1.patch 1556 RMD160 3d0d4d86f4b8f577bc547449ab3204a8cba6e90f SHA1 4232567b3d483ae239e687bcebe3eab7b52e5631 SHA256 3e59a84b84c8bc4924e9490204bf99a0f6bed7856aecf8f02482151052dd2977 -AUX cc65-2.12.0-cbm_dir-1.patch 654 RMD160 16b11bdc5f6612ccb045b9528e035fafc6086410 SHA1 663982a870d8f107f9c1b707b45b8d6aa519e39b SHA256 00faf9ed1cd75bcef43458e54697a7800ae4f382d48d275e016470975b9b2d75 +AUX cc65-2.13.2-asneeded-1.patch 4394 RMD160 e999cdf8105c3265c4043ffc8d2b70709cbb801a SHA1 8a6b69f9c8662cb6b27617d588626a9eb954df85 SHA256 c1b4590f80a7f96ee0c096f366515caeac322e4e88d41365973b325394300034 AUX patch-2.12.0-01.patch 1356 RMD160 f198df987660ab49dacc00d9dd11fb63438e9235 SHA1 6898b0a870f72db1bca87915dda428b9ef26c1b7 SHA256 b20379f5ca6ec4799090bc37c5ad4e4b2cb3ef7bb9e17c4f3a36adc65d5f6ef3 AUX patch-2.12.0-02.patch 919 RMD160 f750c63aa82328131f3b4c5443dad7161716e2bf SHA1 7e21671a749840a0bfe19e3ffa80936372dcc92d SHA256 670d0ba6c9a92f87df4af704d989ec8a2b46ec60a5c60e9f8fa7550edcbc0ff0 -DIST cc65-sources-2.13.1.tar.bz2 1091286 RMD160 71708240b54592e89f23d527878f3d9a69af35ec SHA1 1ea24662d92362b20cb67cb4dccc4d7dab3e906e SHA256 d874e654975ddf0b87690d00e00abb72a780f51253ff0e6c3a017c287cffd338 DIST cc65-sources-2.13.2.tar.bz2 1100100 RMD160 5e42fe8cb6a638c5444e7855192adeafbb80986d SHA1 094e14b32117250e8557843a57fad5e220bc93fc SHA256 74fc224044aaaefe1219ada92c7aaee066ecba414b986f04213b6093bb7a5691 -EBUILD cc65-2.13.1.ebuild 2757 RMD160 b818141f3688a5a365d4cc072097fdad33e42231 SHA1 e7a6f34285666861c97e08ff73e644ab767db66a SHA256 f3fd61a943b4e1cac2b3a120cb691e1c5c038e77d8c9ac6c344e0094b2e15abc -EBUILD cc65-2.13.2.ebuild 2757 RMD160 b818141f3688a5a365d4cc072097fdad33e42231 SHA1 e7a6f34285666861c97e08ff73e644ab767db66a SHA256 f3fd61a943b4e1cac2b3a120cb691e1c5c038e77d8c9ac6c344e0094b2e15abc -MISC ChangeLog 2182 RMD160 9e438d4aca5827e619fb412e0096f8796b9fd555 SHA1 e37919480515ed7968b8557a225d781f5090a7fa SHA256 e039f2fc0916848009be749a57ef59dc3b438139c17d3458232bcc6062b40c97 +EBUILD cc65-2.13.2-r1.ebuild 2772 RMD160 8df296789b85c11b725aaa5ab5ec79badfc99ab9 SHA1 9c9993c07009675f360a2b2c83228d4501679c38 SHA256 d5e4305c69741243b333dda9ba1b96c26ec92ae04dbd2f7f90172aec8b75a95f +MISC ChangeLog 2372 RMD160 d7a26a20bdaef2440a2437662f981723bbbbe0ad SHA1 77f78dac314f0195154494e875c6f1e04f3dfae6 SHA256 f08dd25b40da9908d4502ec15b3af3113cf44ab2fb5e51ceca3ffd5e4da0b738 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/dev-embedded/cc65/cc65-2.13.1.ebuild b/dev-embedded/cc65/cc65-2.13.2-r1.ebuild similarity index 85% rename from dev-embedded/cc65/cc65-2.13.1.ebuild rename to dev-embedded/cc65/cc65-2.13.2-r1.ebuild index f5ba2104..169f67ca 100644 --- a/dev-embedded/cc65/cc65-2.13.1.ebuild +++ b/dev-embedded/cc65/cc65-2.13.2-r1.ebuild @@ -22,8 +22,8 @@ RDEPEND="" #S=${WORKDIR}/${PN}-snapshot-${PV} src_prepare() { - # add sim65 sometimes useful -# sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak + # uncomment to install sim65 + #sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak # correct paths for install (also in documentation) sed -i -e "s:)/lib:)/$(get_libdir):g" make/gcc.mak @@ -31,24 +31,23 @@ src_prepare() { sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" src/ld65/make/gcc.mak sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" doc/ld65.sgml - #solve conflict by renameing make.info to cc65make.info + # solve conflict by renameing make.info to cc65make.info sed -i -e "s:make.sgml:cc65make.sgml:g" doc/Makefile mv doc/make.sgml doc/cc65make.sgml -# epatch "${FILESDIR}"/cc65-2.12.0-asneeded-1.patch -# epatch "${FILESDIR}"/cc65-2.12.0-cbm_dir-1.patch + epatch "${FILESDIR}"/cc65-2.13.2-asneeded-1.patch } src_compile() { - # the build needs to be split atherwise we can't specify CC + # the build needs to be split otherwise we can't specify CC # these makefiles are not parallel build aware - emake -j1 -C src -f make/gcc.mak CC="$(tc-getCC)" AR="$(tc-getAR)" || die "src build fail" + emake -j1 -C src -f make/gcc.mak CC="$(tc-getCC)" AR="$(tc-getAR)" CFLAGS="-g -O2 -Wall -W -std=c89 ${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "src build fail" emake -j1 -C libsrc || die "libsrc build fail" use doc && emake -j1 -C doc } src_install() { - # cant trust the install target (sandbox violation) so do it by hand + # can't trust the install target (sandbox violation) so do it by hand dobin src/*65/*65 src/ca65html/ca65html src/grc/grc || die "dobin fail" insinto /usr/$(get_libdir)/cc65/emd doins libsrc/*.emd || die "install memory map fail" diff --git a/dev-embedded/cc65/cc65-2.13.2.ebuild b/dev-embedded/cc65/cc65-2.13.2.ebuild deleted file mode 100644 index f5ba2104..00000000 --- a/dev-embedded/cc65/cc65-2.13.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="It's a complete cross development package for 65(C)02 systems." -HOMEPAGE="http://www.cc65.org" -#SRC_URI="ftp://ftp.musoftware.de/pub/uz/cc65/snapshot/cc65-snapshot-sources-${PV}.tar.bz2" -SRC_URI="ftp://ftp.musoftware.de/pub/uz/${PN}/${PN}-sources-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~arm" -IUSE="doc" - -DEPEND="doc? ( app-text/linuxdoc-tools )" -RDEPEND="" - -#S=${WORKDIR}/${PN}-snapshot-${PV} - -src_prepare() { - # add sim65 sometimes useful -# sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak - - # correct paths for install (also in documentation) - sed -i -e "s:)/lib:)/$(get_libdir):g" make/gcc.mak - sed -i -e "s:/lib/cc65/inc:/$(get_libdir)/cc65/inc:g" src/cc65/make/gcc.mak - sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" src/ld65/make/gcc.mak - sed -i -e "s:/lib/cc65/lib:/$(get_libdir)/cc65/lib:g" doc/ld65.sgml - - #solve conflict by renameing make.info to cc65make.info - sed -i -e "s:make.sgml:cc65make.sgml:g" doc/Makefile - mv doc/make.sgml doc/cc65make.sgml - -# epatch "${FILESDIR}"/cc65-2.12.0-asneeded-1.patch -# epatch "${FILESDIR}"/cc65-2.12.0-cbm_dir-1.patch -} - -src_compile() { - # the build needs to be split atherwise we can't specify CC - # these makefiles are not parallel build aware - emake -j1 -C src -f make/gcc.mak CC="$(tc-getCC)" AR="$(tc-getAR)" || die "src build fail" - emake -j1 -C libsrc || die "libsrc build fail" - use doc && emake -j1 -C doc -} - -src_install() { - # cant trust the install target (sandbox violation) so do it by hand - dobin src/*65/*65 src/ca65html/ca65html src/grc/grc || die "dobin fail" - insinto /usr/$(get_libdir)/cc65/emd - doins libsrc/*.emd || die "install memory map fail" - insinto /usr/$(get_libdir)/cc65/joy - doins libsrc/*.joy || die "install joystick driver fail" - insinto /usr/$(get_libdir)/cc65/mou - doins libsrc/*.mou || die "install mouse driver fail" - insinto /usr/$(get_libdir)/cc65/ser - doins libsrc/*.ser || die "install UART driver fail" - insinto /usr/$(get_libdir)/cc65/tgi - doins libsrc/*.tgi || die "install graphic driver fail" - insinto /usr/$(get_libdir)/cc65/asminc - doins asminc/*.inc || die "install asm include fail" - insinto /usr/$(get_libdir)/cc65/include - doins -r include/* || die "install include fail" - insinto /usr/$(get_libdir)/cc65/lib - doins libsrc/*.lib || die "install lib definations fail" - doins libsrc/*.o || die "install lib fail" - use doc && dohtml doc/*.htm* - doman packages/debian/*.1 || die "man install fail" - use doc && doinfo doc/*.info - dodoc src/ld65/cfg/*.cfg || die "cfg install fail" - dodoc src/ca65/macpack/*.mac || die "macro install fail" -} diff --git a/dev-embedded/cc65/files/cc65-2.12.0-asneeded-1.patch b/dev-embedded/cc65/files/cc65-2.12.0-asneeded-1.patch deleted file mode 100644 index 968dc8e6..00000000 --- a/dev-embedded/cc65/files/cc65-2.12.0-asneeded-1.patch +++ /dev/null @@ -1,43 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2009-02-02 -Initial Package Version: 2.12.0 -Origin: me -Upstream Status: unknown -Description: reorder link command to work with --as-needed link command - -diff -Naur cc65-2.12.0.orig/src/cc65/make/gcc.mak cc65-2.12.0/src/cc65/make/gcc.mak ---- cc65-2.12.0.orig/src/cc65/make/gcc.mak 2005-12-11 12:40:50.000000000 +0000 -+++ cc65-2.12.0/src/cc65/make/gcc.mak 2009-02-02 21:59:15.607008243 +0000 -@@ -110,7 +110,7 @@ - endif - - $(EXE): $(OBJS) $(LIBS) -- $(CC) $(LDFLAGS) -o $(EXE) $(CFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o $(EXE) - @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi - - clean: -diff -Naur cc65-2.12.0.orig/src/cl65/make/gcc.mak cc65-2.12.0/src/cl65/make/gcc.mak ---- cc65-2.12.0.orig/src/cl65/make/gcc.mak 2005-12-11 12:40:50.000000000 +0000 -+++ cc65-2.12.0/src/cl65/make/gcc.mak 2009-02-02 22:00:23.431638032 +0000 -@@ -37,7 +37,7 @@ - - - cl65: $(OBJS) $(LIBS) -- $(CC) $(LDFLAGS) -o cl65 $(OBJS) $(LIBS) -+ $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o cl65 - @if [ $(OS2_SHELL) ] ; then $(EBIND) cl65 ; fi - - clean: -diff -Naur cc65-2.12.0.orig/src/od65/make/gcc.mak cc65-2.12.0/src/od65/make/gcc.mak ---- cc65-2.12.0.orig/src/od65/make/gcc.mak 2005-12-11 12:40:51.000000000 +0000 -+++ cc65-2.12.0/src/od65/make/gcc.mak 2009-02-02 22:01:31.053718478 +0000 -@@ -33,7 +33,7 @@ - - - $(EXE): $(OBJS) -- $(CC) $(LDFLAGS) -o $(EXE) $(CFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o $(EXE) - @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi - - clean: diff --git a/dev-embedded/cc65/files/cc65-2.12.0-cbm_dir-1.patch b/dev-embedded/cc65/files/cc65-2.12.0-cbm_dir-1.patch deleted file mode 100644 index 7a07ad9c..00000000 --- a/dev-embedded/cc65/files/cc65-2.12.0-cbm_dir-1.patch +++ /dev/null @@ -1,20 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2009-02-02 -Initial Package Version: 2.12.0 -Origin: http://www.cc65.org/mailarchive/2009-01/6422.html -Upstream Status: unknown -Description: patch to get the directory functions in the cbm lib. - -diff -Naur cc65-2.12.0.orig/libsrc/cbm/Makefile cc65-2.12.0/libsrc/cbm/Makefile ---- cc65-2.12.0.orig/libsrc/cbm/Makefile 2005-07-24 13:20:49.000000000 +0000 -+++ cc65-2.12.0/libsrc/cbm/Makefile 2009-02-02 22:18:12.086354969 +0000 -@@ -31,7 +31,8 @@ - - C_OBJS = cbm_dir.o \ - cbm_load.o \ -- cbm_save.o -+ cbm_save.o \ -+ cbm_dir.o - - S_OBJS = c_acptr.o \ - c_basin.o \ diff --git a/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch b/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch new file mode 100644 index 00000000..e03100a0 --- /dev/null +++ b/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch @@ -0,0 +1,127 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2010-11-07 +Initial Package Version: 2.13.2 +Origin: me +Upstream Status: unknown +Description: correct the linkorder in the make files + +diff -Naur cc65-2.13.2.orig/src/ar65/make/gcc.mak cc65-2.13.2/src/ar65/make/gcc.mak +--- cc65-2.13.2.orig/src/ar65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/ar65/make/gcc.mak 2010-11-07 05:51:00.000000000 +0000 +@@ -51,7 +51,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/ca65/make/gcc.mak cc65-2.13.2/src/ca65/make/gcc.mak +--- cc65-2.13.2.orig/src/ca65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/ca65/make/gcc.mak 2010-11-07 05:50:17.000000000 +0000 +@@ -93,7 +93,7 @@ + endif + + $(EXE): $(INCS) $(OBJS) $(LIBS) +- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + inc: $(INCS) +diff -Naur cc65-2.13.2.orig/src/cc65/make/gcc.mak cc65-2.13.2/src/cc65/make/gcc.mak +--- cc65-2.13.2.orig/src/cc65/make/gcc.mak 2010-11-07 05:47:24.000000000 +0000 ++++ cc65-2.13.2/src/cc65/make/gcc.mak 2010-11-07 05:48:00.000000000 +0000 +@@ -127,7 +127,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -lm -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + .PHONY: svnversion +diff -Naur cc65-2.13.2.orig/src/cl65/make/gcc.mak cc65-2.13.2/src/cl65/make/gcc.mak +--- cc65-2.13.2.orig/src/cl65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/cl65/make/gcc.mak 2010-11-07 05:51:15.000000000 +0000 +@@ -44,7 +44,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/co65/make/gcc.mak cc65-2.13.2/src/co65/make/gcc.mak +--- cc65-2.13.2.orig/src/co65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/co65/make/gcc.mak 2010-11-07 05:50:34.000000000 +0000 +@@ -44,7 +44,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/da65/make/gcc.mak cc65-2.13.2/src/da65/make/gcc.mak +--- cc65-2.13.2.orig/src/da65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/da65/make/gcc.mak 2010-11-07 05:49:57.000000000 +0000 +@@ -58,7 +58,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/grc/make/gcc.mak cc65-2.13.2/src/grc/make/gcc.mak +--- cc65-2.13.2.orig/src/grc/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/grc/make/gcc.mak 2010-11-07 05:50:47.000000000 +0000 +@@ -38,7 +38,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/ld65/make/gcc.mak cc65-2.13.2/src/ld65/make/gcc.mak +--- cc65-2.13.2.orig/src/ld65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/ld65/make/gcc.mak 2010-11-07 05:49:43.000000000 +0000 +@@ -100,7 +100,7 @@ + endif + + $(EXE): $(INCS) $(OBJS) $(LIBS) +- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + inc: $(INCS) +diff -Naur cc65-2.13.2.orig/src/od65/make/gcc.mak cc65-2.13.2/src/od65/make/gcc.mak +--- cc65-2.13.2.orig/src/od65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000 ++++ cc65-2.13.2/src/od65/make/gcc.mak 2010-11-07 05:49:09.000000000 +0000 +@@ -44,7 +44,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + clean: +diff -Naur cc65-2.13.2.orig/src/sim65/make/gcc.mak cc65-2.13.2/src/sim65/make/gcc.mak +--- cc65-2.13.2.orig/src/sim65/make/gcc.mak 2010-11-07 05:47:24.000000000 +0000 ++++ cc65-2.13.2/src/sim65/make/gcc.mak 2010-11-07 05:48:47.000000000 +0000 +@@ -53,7 +53,7 @@ + endif + + $(EXE): $(OBJS) $(LIBS) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ + @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi + + .PHONY: chips