From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/git/files/autotools.patch | 26 ++++++++++++++++++ .../files/git-gui-install-mode-arg-spaces.patch | 32 ++++++++++++++++++++++ recipes/git/files/snprintf-returns-bogus.patch | 12 ++++++++ recipes/git/git-native_1.6.0.4.bb | 4 +++ recipes/git/git.inc | 20 ++++++++++++++ recipes/git/git_1.6.0.4.bb | 9 ++++++ 6 files changed, 103 insertions(+) create mode 100644 recipes/git/files/autotools.patch create mode 100644 recipes/git/files/git-gui-install-mode-arg-spaces.patch create mode 100644 recipes/git/files/snprintf-returns-bogus.patch create mode 100644 recipes/git/git-native_1.6.0.4.bb create mode 100644 recipes/git/git.inc create mode 100644 recipes/git/git_1.6.0.4.bb (limited to 'recipes/git') diff --git a/recipes/git/files/autotools.patch b/recipes/git/files/autotools.patch new file mode 100644 index 0000000000..0666118cde --- /dev/null +++ b/recipes/git/files/autotools.patch @@ -0,0 +1,26 @@ +Index: git-1.5.2.3/configure.ac +=================================================================== +--- git-1.5.2.3.orig/configure.ac 2007-07-02 10:11:39.000000000 +0200 ++++ git-1.5.2.3/configure.ac 2007-08-04 00:02:13.000000000 +0200 +@@ -235,7 +235,8 @@ + else if (strcmp(buf, "12345")) + exit(2);]])], + [ac_cv_c_c99_format=yes], +- [ac_cv_c_c99_format=no]) ++ [ac_cv_c_c99_format=no], ++ [ac_cv_c_c99_format=yes]) + ]) + if test $ac_cv_c_c99_format = no; then + NO_C99_FORMAT=YesPlease +Index: git-1.5.2.3/config.mak.in +=================================================================== +--- git-1.5.2.3.orig/config.mak.in 2007-07-02 10:11:39.000000000 +0200 ++++ git-1.5.2.3/config.mak.in 2007-08-04 00:07:04.000000000 +0200 +@@ -3,6 +3,7 @@ + + CC = @CC@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + AR = @AR@ + TAR = @TAR@ + #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources diff --git a/recipes/git/files/git-gui-install-mode-arg-spaces.patch b/recipes/git/files/git-gui-install-mode-arg-spaces.patch new file mode 100644 index 0000000000..10e4eb2e1c --- /dev/null +++ b/recipes/git/files/git-gui-install-mode-arg-spaces.patch @@ -0,0 +1,32 @@ +--- git/git-gui/Makefile.orig 2007-12-26 17:16:42.000000000 +1030 ++++ git/git-gui/Makefile 2007-12-26 17:17:16.000000000 +1030 +@@ -31,11 +31,11 @@ + INSTALL = install + endif + +-INSTALL_D0 = $(INSTALL) -d -m755 # space is required here ++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here + INSTALL_D1 = +-INSTALL_R0 = $(INSTALL) -m644 # space is required here ++INSTALL_R0 = $(INSTALL) -m 644 # space is required here + INSTALL_R1 = +-INSTALL_X0 = $(INSTALL) -m755 # space is required here ++INSTALL_X0 = $(INSTALL) -m 755 # space is required here + INSTALL_X1 = + INSTALL_L0 = rm -f # space is required here + INSTALL_L1 = && ln # space is required here +@@ -50,11 +50,11 @@ + QUIET_2DEVNULL = 2>/dev/null + + INSTALL_D0 = dir= +- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" ++ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" + INSTALL_R0 = src= +- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src ++ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src + INSTALL_X0 = src= +- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src ++ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src + + INSTALL_L0 = dst= + INSTALL_L1 = && src= diff --git a/recipes/git/files/snprintf-returns-bogus.patch b/recipes/git/files/snprintf-returns-bogus.patch new file mode 100644 index 0000000000..568bb1f56b --- /dev/null +++ b/recipes/git/files/snprintf-returns-bogus.patch @@ -0,0 +1,12 @@ +--- git-1.6.0.4-orig/configure.ac 2008-11-18 15:28:03.000000000 -0500 ++++ git-1.6.0.4/configure.ac 2008-11-18 15:30:45.000000000 -0500 +@@ -373,7 +373,8 @@ + if (snprintf(buf, 3, "%s", "12345") != 5 + || strcmp(buf, "12")) return 1]])], + [ac_cv_snprintf_returns_bogus=no], +- [ac_cv_snprintf_returns_bogus=yes]) ++ [ac_cv_snprintf_returns_bogus=yes], ++ [ac_cv_snprintf_returns_bogus=no]) + ]) + if test $ac_cv_snprintf_returns_bogus = yes; then + SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes diff --git a/recipes/git/git-native_1.6.0.4.bb b/recipes/git/git-native_1.6.0.4.bb new file mode 100644 index 0000000000..b5bfa02cd9 --- /dev/null +++ b/recipes/git/git-native_1.6.0.4.bb @@ -0,0 +1,4 @@ +require git.inc +inherit native +DEPENDS = "openssl-native curl-native zlib-native expat-native" +PR = "r3" diff --git a/recipes/git/git.inc b/recipes/git/git.inc new file mode 100644 index 0000000000..fb88fd4135 --- /dev/null +++ b/recipes/git/git.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +SECTION = "console/utils" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ + file://autotools.patch;patch=1 \ + " +S = "${WORKDIR}/git-${PV}" + +inherit autotools + +EXTRA_OEMAKE = "NO_TCLTK=1" + +do_install () { + oe_runmake install DESTDIR="${D}" bindir=${bindir} \ + template_dir=${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${datadir}/git-core/python +} + +FILES_${PN} += "${datadir}/git-core" diff --git a/recipes/git/git_1.6.0.4.bb b/recipes/git/git_1.6.0.4.bb new file mode 100644 index 0000000000..e839ab960a --- /dev/null +++ b/recipes/git/git_1.6.0.4.bb @@ -0,0 +1,9 @@ +require git.inc + +SRC_URI += "file://snprintf-returns-bogus.patch;patch=1" + +DEPENDS = "openssl curl zlib expat" +RDEPENDS = "perl perl-module-file-path cpio findutils sed" +PR = "r4" + +FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" -- cgit v1.2.3