diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-04-01 21:10:05 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-04-01 21:10:05 +0000 |
| commit | dbaf04e7de829b6e919e77b9addee04fe0ec7599 (patch) | |
| tree | 1b17314a52bf2c2cbb1850888f4771d929327866 /recipes/disko/files | |
| parent | 95f33f6c42bb02eb7574fb3647ed93fc14a9a073 (diff) | |
| parent | 3d25ff174b24e7691e17ceddeef5ce95f9f4e6a6 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/disko/files')
| -rw-r--r-- | recipes/disko/files/header.patch | 13 | ||||
| -rw-r--r-- | recipes/disko/files/pkgconfig.patch | 26 |
2 files changed, 39 insertions, 0 deletions
diff --git a/recipes/disko/files/header.patch b/recipes/disko/files/header.patch new file mode 100644 index 0000000000..e60d5582e8 --- /dev/null +++ b/recipes/disko/files/header.patch @@ -0,0 +1,13 @@ +Index: git/src/mmsconfig/mmsrcparser.cpp +=================================================================== +--- git.orig/src/mmsconfig/mmsrcparser.cpp 2009-03-25 01:29:20.822096657 +0100 ++++ git/src/mmsconfig/mmsrcparser.cpp 2009-03-25 01:29:34.320881340 +0100 +@@ -26,6 +26,8 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + ++#include <cstring> ++ + #include "mmsconfig/mmsrcparser.h" + #include "mmstools/tools.h" + diff --git a/recipes/disko/files/pkgconfig.patch b/recipes/disko/files/pkgconfig.patch new file mode 100644 index 0000000000..a84106eb6c --- /dev/null +++ b/recipes/disko/files/pkgconfig.patch @@ -0,0 +1,26 @@ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile 2009-03-24 14:41:03.000000000 +0100 ++++ git/Makefile 2009-03-25 02:20:38.613872577 +0100 +@@ -59,7 +59,7 @@ + install-pkgconfig: + @echo "writing pkgconfig information" + @install -d "$(DESTDIR)$(libdir)/../pkgconfig" +- @echo "prefix=$(prefix)" > $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc ++ @echo "prefix=/usr" > $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc + @echo "exec_prefix=\$${prefix}/bin" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc + @echo "libdir=\$${prefix}/lib/disko" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc + @echo "includedir=\$${prefix}/include/disko" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc +Index: git/SConstruct +=================================================================== +--- git.orig/SConstruct 2009-03-25 02:22:03.018024446 +0100 ++++ git/SConstruct 2009-03-25 02:22:41.668240834 +0100 +@@ -473,7 +473,7 @@ + if 'mysql' in env['database']: + disko_pc_requires += ', mysql' + +- disko_pc.write('prefix=' + env['prefix'] + '\n') ++ disko_pc.write('prefix=/usr' + '\n') + disko_pc.write('exec_prefix=${prefix}\n') + disko_pc.write('libdir=${exec_prefix}/lib/disko\n') + disko_pc.write('includedir=${exec_prefix}/include/disko\n\n') |