diff options
author | Chuck Short <zul@gentoo.org> | 2004-03-11 22:12:17 +0000 |
---|---|---|
committer | Chuck Short <zul@gentoo.org> | 2004-03-11 22:12:17 +0000 |
commit | b9751bbeeed756c2b44562c7dedcd696edf79394 (patch) | |
tree | 36a2b6964168b02f2d6587469de5f566b711856c /dev-util/vdkbuilder | |
parent | Merged latest unstable vlc-0.6.2-r1, and vlc provided ebuild by Derk-Jan Hart... (diff) | |
download | historical-b9751bbeeed756c2b44562c7dedcd696edf79394.tar.gz historical-b9751bbeeed756c2b44562c7dedcd696edf79394.tar.bz2 historical-b9751bbeeed756c2b44562c7dedcd696edf79394.zip |
More gcc fixes.
Diffstat (limited to 'dev-util/vdkbuilder')
-rw-r--r-- | dev-util/vdkbuilder/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/vdkbuilder/Manifest | 4 | ||||
-rw-r--r-- | dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch | 22 |
3 files changed, 23 insertions, 8 deletions
diff --git a/dev-util/vdkbuilder/ChangeLog b/dev-util/vdkbuilder/ChangeLog index a045b8c3054b..60233a4f9474 100644 --- a/dev-util/vdkbuilder/ChangeLog +++ b/dev-util/vdkbuilder/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/vdkbuilder # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.10 2004/03/04 16:00:20 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.11 2004/03/11 22:12:07 zul Exp $ + + 11 Mar 2004; Chuck Short <zul@gentoo.org> files/vdkbuilder-gcc3.patch: + More gcc3 fixes. Closes #41687. 04 Mar 2004; Seemant Kulleen <seemant@gentoo.org> vdkbuilder-2.0.2.ebuild, vdkbuilder-2.0.3.ebuild, vdkbuilder-2.0.5.ebuild: diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest index c36b13263cf7..13e9442fd76c 100644 --- a/dev-util/vdkbuilder/Manifest +++ b/dev-util/vdkbuilder/Manifest @@ -1,8 +1,8 @@ MD5 1ad37189f716542f7484172093fbe0c0 vdkbuilder-2.0.3.ebuild 1063 MD5 d6d9e47dcdf7b9af8d81640663ac4e3c vdkbuilder-2.0.5.ebuild 855 MD5 0bc318bbbfb864dead73f2ff4f7d525c vdkbuilder-2.0.2.ebuild 998 -MD5 6ddcb454663cac2a26e49c6624b87d1a ChangeLog 1282 +MD5 e1f72d3c11df4d2cfee2b2393b318227 ChangeLog 1386 MD5 99848ddbdb27f9085a04d4be864953c8 files/digest-vdkbuilder-2.0.2 61 MD5 517f2d1fd4853a2f7c1cf9a915477202 files/digest-vdkbuilder-2.0.3 69 MD5 83d1ae829fb0623da0370fb29af1ed63 files/digest-vdkbuilder-2.0.5 69 -MD5 27e9a6ce9dccdfa29a4a27cdbb8e371e files/vdkbuilder-gcc3.patch 1522 +MD5 55b35d22bab2cc76ac63c62ca45e1a25 files/vdkbuilder-gcc3.patch 1956 diff --git a/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch b/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch index 228f9fad164d..cb8420cb134c 100644 --- a/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch +++ b/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch @@ -1,6 +1,19 @@ -diff -Naur vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc ---- vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc 2002-06-04 07:56:35.000000000 +0000 -+++ vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc 2003-12-14 18:07:08.557890952 +0000 +diff -Naur vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc vdkbuilder2-2.0.3-gentoo/vdkbuilder/vdkb_templates.cc +--- vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc 2002-06-04 07:56:35.000000000 +0000 ++++ vdkbuilder2-2.0.3-gentoo/vdkbuilder/vdkb_templates.cc 2004-03-11 18:41:25.000000000 +0000 +@@ -796,10 +796,10 @@ + { + namepath = get_path(complete_name); + if(namepath && !strcmp(namepath,(char*) path)) +- fprintf(fp,"\t$(PRJ_DIR)/%s_gui.o\\\n", ++ fprintf(fp,"\t$(PRJ_DIR)/%s_gui.o\n", + get_shortfilename(complete_name)); + else +- fprintf(fp,"\t%s_gui.o\\\n",li.current()->Name()); ++ fprintf(fp,"\t%s_gui.o\n",li.current()->Name()); + } + if(namepath) + delete[] namepath; @@ -856,34 +856,34 @@ char* pw = getcwd(NULL,MAXPATHLEN); if(pw) @@ -21,7 +34,6 @@ diff -Naur vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc vdkbuilder2-2.0.3/ -\n\ -\n$(TARGET): $(OBJECTS)\ -\n\t$(LINK) -o $(TARGET) $(OBJECTS) $(OTHERS_OBJECTS) $(LIBS)\ --\n\ + fprintf(fp," +\n####### Implicit rules +\n.SUFFIXES: .%s .%s @@ -35,7 +47,7 @@ diff -Naur vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc vdkbuilder2-2.0.3/ +\n####### Build rules +\n +\nall: $(TARGET) -+\n\ + \n\ +\n$(TARGET): $(OBJECTS) +\n\t$(LINK) -o $(TARGET) $(OBJECTS) $(OTHERS_OBJECTS) $(LIBS) +\n |