From 8a2a48b5c194d80da6f31c4d61b5da608996deab Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 20 Apr 2018 14:09:38 +0200 Subject: libcgicc: don't forget the patches Signed-off-by: Michael Olbrich --- ...n-t-build-docs-if-doxygen-isn-t-available.patch | 51 ++++++++++++++++++++++ .../0002-cgicc-config-add-SYSROOT-support.patch | 30 +++++++++++++ patches/cgicc-3.2.19/autogen.sh | 1 + patches/cgicc-3.2.19/series | 2 + ...n-t-build-docs-if-doxygen-isn-t-available.patch | 51 ---------------------- .../0002-cgicc-config-add-SYSROOT-support.patch | 30 ------------- patches/cgicc-3.2.9/autogen.sh | 1 - patches/cgicc-3.2.9/series | 2 - 8 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 patches/cgicc-3.2.19/0001-don-t-build-docs-if-doxygen-isn-t-available.patch create mode 100644 patches/cgicc-3.2.19/0002-cgicc-config-add-SYSROOT-support.patch create mode 120000 patches/cgicc-3.2.19/autogen.sh create mode 100644 patches/cgicc-3.2.19/series delete mode 100644 patches/cgicc-3.2.9/0001-don-t-build-docs-if-doxygen-isn-t-available.patch delete mode 100644 patches/cgicc-3.2.9/0002-cgicc-config-add-SYSROOT-support.patch delete mode 120000 patches/cgicc-3.2.9/autogen.sh delete mode 100644 patches/cgicc-3.2.9/series diff --git a/patches/cgicc-3.2.19/0001-don-t-build-docs-if-doxygen-isn-t-available.patch b/patches/cgicc-3.2.19/0001-don-t-build-docs-if-doxygen-isn-t-available.patch new file mode 100644 index 000000000..cceccd6a5 --- /dev/null +++ b/patches/cgicc-3.2.19/0001-don-t-build-docs-if-doxygen-isn-t-available.patch @@ -0,0 +1,51 @@ +From 1bb73933593e775ac70ac548c55267d2005ce0e7 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Sat, 9 Jan 2010 18:26:27 +0100 +Subject: [PATCH 1/2] don't build docs if doxygen isn't available + +Signed-off-by: Marc Kleine-Budde +--- + Makefile.am | 10 ++++++++-- + configure.ac | 3 ++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 68d9831..79dc8d3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,9 +8,15 @@ else + DEMO = + endif + +-ACLOCAL_AMFLAGS= ++if DOCS ++DOC = doc ++else ++DOC = ++endif ++ ++ACLOCAL_AMFLAGS= + +-SUBDIRS = cgicc doc support $(DEMO) ++SUBDIRS = cgicc support $(DEMO) $(DOC) + + CLEANFILES = *~ + +diff --git a/configure.ac b/configure.ac +index 23ae071..6cee368 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,8 +17,9 @@ dnl Checks for programs. + AC_PROG_CXX + AC_PROG_INSTALL + AC_PROG_LIBTOOL +-AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) + ++AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) ++AM_CONDITIONAL(DOCS, [test -n "${DOXYGEN}"]) + + + dnl Determine host system type +-- +1.6.6 + diff --git a/patches/cgicc-3.2.19/0002-cgicc-config-add-SYSROOT-support.patch b/patches/cgicc-3.2.19/0002-cgicc-config-add-SYSROOT-support.patch new file mode 100644 index 000000000..b453b39a5 --- /dev/null +++ b/patches/cgicc-3.2.19/0002-cgicc-config-add-SYSROOT-support.patch @@ -0,0 +1,30 @@ +From 01dc96f2fa73ad30711a82dda59cb1b552ce9782 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Sat, 9 Jan 2010 19:05:18 +0100 +Subject: [PATCH 2/2] cgicc-config: add SYSROOT support + +Signed-off-by: Marc Kleine-Budde +--- + support/cgicc-config.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/support/cgicc-config.in b/support/cgicc-config.in +index 9ab88be..0708ec8 100644 +--- a/support/cgicc-config.in ++++ b/support/cgicc-config.in +@@ -66,10 +66,10 @@ while test $# -gt 0; do + --exec-prefix) echo "$exec_prefix" && exit 0 ;; + + ## Object code dir +- --libdir) echo "$libdir" && exit 0 ;; ++ --libdir) echo "${SYSROOT}$libdir" && exit 0 ;; + + ## Header file dir +- --includedir) echo "$includedir" && exit 0 ;; ++ --includedir) echo "${SYSROOT}$includedir" && exit 0 ;; + + ## C++ compiler flags + --cxxflags) echo "$cxxflags" && exit 0 ;; +-- +1.6.6 + diff --git a/patches/cgicc-3.2.19/autogen.sh b/patches/cgicc-3.2.19/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/cgicc-3.2.19/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/cgicc-3.2.19/series b/patches/cgicc-3.2.19/series new file mode 100644 index 000000000..426705817 --- /dev/null +++ b/patches/cgicc-3.2.19/series @@ -0,0 +1,2 @@ +0001-don-t-build-docs-if-doxygen-isn-t-available.patch +0002-cgicc-config-add-SYSROOT-support.patch diff --git a/patches/cgicc-3.2.9/0001-don-t-build-docs-if-doxygen-isn-t-available.patch b/patches/cgicc-3.2.9/0001-don-t-build-docs-if-doxygen-isn-t-available.patch deleted file mode 100644 index cceccd6a5..000000000 --- a/patches/cgicc-3.2.9/0001-don-t-build-docs-if-doxygen-isn-t-available.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1bb73933593e775ac70ac548c55267d2005ce0e7 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Sat, 9 Jan 2010 18:26:27 +0100 -Subject: [PATCH 1/2] don't build docs if doxygen isn't available - -Signed-off-by: Marc Kleine-Budde ---- - Makefile.am | 10 ++++++++-- - configure.ac | 3 ++- - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 68d9831..79dc8d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,9 +8,15 @@ else - DEMO = - endif - --ACLOCAL_AMFLAGS= -+if DOCS -+DOC = doc -+else -+DOC = -+endif -+ -+ACLOCAL_AMFLAGS= - --SUBDIRS = cgicc doc support $(DEMO) -+SUBDIRS = cgicc support $(DEMO) $(DOC) - - CLEANFILES = *~ - -diff --git a/configure.ac b/configure.ac -index 23ae071..6cee368 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,8 +17,9 @@ dnl Checks for programs. - AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_LIBTOOL --AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) - -+AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) -+AM_CONDITIONAL(DOCS, [test -n "${DOXYGEN}"]) - - - dnl Determine host system type --- -1.6.6 - diff --git a/patches/cgicc-3.2.9/0002-cgicc-config-add-SYSROOT-support.patch b/patches/cgicc-3.2.9/0002-cgicc-config-add-SYSROOT-support.patch deleted file mode 100644 index b453b39a5..000000000 --- a/patches/cgicc-3.2.9/0002-cgicc-config-add-SYSROOT-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 01dc96f2fa73ad30711a82dda59cb1b552ce9782 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Sat, 9 Jan 2010 19:05:18 +0100 -Subject: [PATCH 2/2] cgicc-config: add SYSROOT support - -Signed-off-by: Marc Kleine-Budde ---- - support/cgicc-config.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/support/cgicc-config.in b/support/cgicc-config.in -index 9ab88be..0708ec8 100644 ---- a/support/cgicc-config.in -+++ b/support/cgicc-config.in -@@ -66,10 +66,10 @@ while test $# -gt 0; do - --exec-prefix) echo "$exec_prefix" && exit 0 ;; - - ## Object code dir -- --libdir) echo "$libdir" && exit 0 ;; -+ --libdir) echo "${SYSROOT}$libdir" && exit 0 ;; - - ## Header file dir -- --includedir) echo "$includedir" && exit 0 ;; -+ --includedir) echo "${SYSROOT}$includedir" && exit 0 ;; - - ## C++ compiler flags - --cxxflags) echo "$cxxflags" && exit 0 ;; --- -1.6.6 - diff --git a/patches/cgicc-3.2.9/autogen.sh b/patches/cgicc-3.2.9/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/cgicc-3.2.9/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/cgicc-3.2.9/series b/patches/cgicc-3.2.9/series deleted file mode 100644 index 426705817..000000000 --- a/patches/cgicc-3.2.9/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-don-t-build-docs-if-doxygen-isn-t-available.patch -0002-cgicc-config-add-SYSROOT-support.patch -- cgit v1.2.3