From f7cca160d35eff8c2f5e9dd810a34864611b9baa Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 17 Aug 2011 09:56:11 +0200 Subject: ncurses: clean up patches It makes no sense to first remove dependecies and add them again in a later patch. Signed-off-by: Marc Kleine-Budde --- .../0001-remove-tools-build-dependency.patch | 37 -------------- .../0001-teach-ncurses-config-about-sysroot.patch | 52 ++++++++++++++++++++ .../0002-teach-ncurses-config-about-sysroot.patch | 56 ---------------------- .../0003-ncurses-add-dependencies.patch | 37 -------------- patches/ncurses-5.9/series | 7 ++- 5 files changed, 55 insertions(+), 134 deletions(-) delete mode 100644 patches/ncurses-5.9/0001-remove-tools-build-dependency.patch create mode 100644 patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch delete mode 100644 patches/ncurses-5.9/0002-teach-ncurses-config-about-sysroot.patch delete mode 100644 patches/ncurses-5.9/0003-ncurses-add-dependencies.patch diff --git a/patches/ncurses-5.9/0001-remove-tools-build-dependency.patch b/patches/ncurses-5.9/0001-remove-tools-build-dependency.patch deleted file mode 100644 index 9ab3f2b73..000000000 --- a/patches/ncurses-5.9/0001-remove-tools-build-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5ffddc3492d8fac3bbe605f48fed90316d8fd4fb Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Thu, 17 Mar 2011 13:34:53 +0100 -Subject: [PATCH 1/3] remove tools build dependency - -make_keys is built as host tool and copied to the real package. -This patch makes sure that it is not rebuilt again. - -Signed-off-by: Michael Olbrich ---- - ncurses/Makefile.in | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in -index 45a26b9..24b0fd4 100644 ---- a/ncurses/Makefile.in -+++ b/ncurses/Makefile.in -@@ -210,7 +210,7 @@ $(DESTDIR)$(libdir) : - ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h - sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ - --init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list -+init_keytry.h: keys.list - ./make_keys$(BUILD_EXEEXT) keys.list > $@ - - keys.list : $(tinfo)/MKkeys_list.sh -@@ -230,7 +230,6 @@ make_hash$(BUILD_EXEEXT) : \ - sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@ - - ./comp_captab.c: \ -- make_hash$(BUILD_EXEEXT) \ - ../include/hashsize.h \ - $(tinfo)/MKcaptab.sh \ - $(tinfo)/MKcaptab.awk --- -1.7.5.3 - diff --git a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch new file mode 100644 index 000000000..0730dc9af --- /dev/null +++ b/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch @@ -0,0 +1,52 @@ +From: Marc Kleine-Budde +Date: Thu, 17 Mar 2011 13:34:53 +0100 +Subject: [PATCH] teach ncurses-config about sysroot + +This patch teaches ncurses-config about sysroot + +Signed-off-by: Marc Kleine-Budde +--- + misc/ncurses-config.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in +index a9c0ac5..08d44bb 100644 +--- a/misc/ncurses-config.in ++++ b/misc/ncurses-config.in +@@ -73,10 +73,10 @@ while test $# -gt 0; do + --cflags) + INCS= + if test "x@WITH_OVERWRITE@" = xno ; then +- INCS="$INCS -I${includedir}/${THIS}" ++ INCS="$INCS -I${SYSROOT}${includedir}/${THIS}" + fi +- if test "${includedir}" != /usr/include ; then +- INCS="$INCS -I${includedir}" ++ if test "${SYSROOT}${includedir}" != /usr/include ; then ++ INCS="$INCS -I${SYSROOT}${includedir}" + fi + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO + $INCS +@@ -85,11 +85,11 @@ ENDECHO + --libs) + if test @TINFO_NAME@ = @LIB_NAME@ ; then + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ ++ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ + ENDECHO + else + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ ++ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ + ENDECHO + fi + ;; +@@ -114,7 +114,7 @@ ENDECHO + echo "${includedir}" + ;; + --libdir) +- echo "${libdir}" ++ echo "${SYSROOT}${libdir}" + ;; + --mandir) + echo "${mandir}" diff --git a/patches/ncurses-5.9/0002-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-5.9/0002-teach-ncurses-config-about-sysroot.patch deleted file mode 100644 index ef5c2be70..000000000 --- a/patches/ncurses-5.9/0002-teach-ncurses-config-about-sysroot.patch +++ /dev/null @@ -1,56 +0,0 @@ -From cedb5f7efc778670c52bd7d4077d96e8e4a93dee Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Thu, 17 Mar 2011 13:34:53 +0100 -Subject: [PATCH 2/3] teach ncurses-config about sysroot - -This patch teaches ncurses-config about sysroot - -Signed-off-by: Marc Kleine-Budde ---- - misc/ncurses-config.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in -index a9c0ac5..08d44bb 100644 ---- a/misc/ncurses-config.in -+++ b/misc/ncurses-config.in -@@ -73,10 +73,10 @@ while test $# -gt 0; do - --cflags) - INCS= - if test "x@WITH_OVERWRITE@" = xno ; then -- INCS="$INCS -I${includedir}/${THIS}" -+ INCS="$INCS -I${SYSROOT}${includedir}/${THIS}" - fi -- if test "${includedir}" != /usr/include ; then -- INCS="$INCS -I${includedir}" -+ if test "${SYSROOT}${includedir}" != /usr/include ; then -+ INCS="$INCS -I${SYSROOT}${includedir}" - fi - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO - $INCS -@@ -85,11 +85,11 @@ ENDECHO - --libs) - if test @TINFO_NAME@ = @LIB_NAME@ ; then - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO -- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ -+ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ - ENDECHO - else - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO -- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ -+ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ - ENDECHO - fi - ;; -@@ -114,7 +114,7 @@ ENDECHO - echo "${includedir}" - ;; - --libdir) -- echo "${libdir}" -+ echo "${SYSROOT}${libdir}" - ;; - --mandir) - echo "${mandir}" --- -1.7.5.3 - diff --git a/patches/ncurses-5.9/0003-ncurses-add-dependencies.patch b/patches/ncurses-5.9/0003-ncurses-add-dependencies.patch deleted file mode 100644 index d03d53cdb..000000000 --- a/patches/ncurses-5.9/0003-ncurses-add-dependencies.patch +++ /dev/null @@ -1,37 +0,0 @@ -From eea58539696d155f594f64add33b7d38b8b20f83 Mon Sep 17 00:00:00 2001 -From: Robert Schwebel -Date: Mon, 20 Jun 2011 16:54:29 +0200 -Subject: [PATCH 3/3] ncurses: add dependencies - -Signed-off-by: Robert Schwebel ---- - ncurses/Makefile.in | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in -index 24b0fd4..8e3d7e9 100644 ---- a/ncurses/Makefile.in -+++ b/ncurses/Makefile.in -@@ -210,7 +210,7 @@ $(DESTDIR)$(libdir) : - ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h - sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ - --init_keytry.h: keys.list -+init_keytry.h: keys.list make_keys$(BUILD_EXEEXT) - ./make_keys$(BUILD_EXEEXT) keys.list > $@ - - keys.list : $(tinfo)/MKkeys_list.sh -@@ -232,7 +232,9 @@ make_hash$(BUILD_EXEEXT) : \ - ./comp_captab.c: \ - ../include/hashsize.h \ - $(tinfo)/MKcaptab.sh \ -- $(tinfo)/MKcaptab.awk -+ $(tinfo)/MKcaptab.awk \ -+ make_keys$(BUILD_EXEEXT) \ -+ make_hash$(BUILD_EXEEXT) - sh -e $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(srcdir)/../include/@TERMINFO_CAPS@ > $@ - - ./lib_keyname.c: keys.list $(base)/MKkeyname.awk --- -1.7.5.3 - diff --git a/patches/ncurses-5.9/series b/patches/ncurses-5.9/series index 9f0a9310d..fbdd3447d 100644 --- a/patches/ncurses-5.9/series +++ b/patches/ncurses-5.9/series @@ -1,5 +1,4 @@ # generated by git-ptx-patches -0001-remove-tools-build-dependency.patch -0002-teach-ncurses-config-about-sysroot.patch -0003-ncurses-add-dependencies.patch -# 03b7e5456ca8d5d7006a5c85c9a037d9 - git-ptx-patches magic +#tag:base --start-number 1 +0001-teach-ncurses-config-about-sysroot.patch +# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic -- cgit v1.2.3