diff options
Diffstat (limited to 'patches/cgicc-3.2.19')
4 files changed, 84 insertions, 0 deletions
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 <mkl@pengutronix.de> +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 <mkl@pengutronix.de> +--- + 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 <mkl@pengutronix.de> +Date: Sat, 9 Jan 2010 19:05:18 +0100 +Subject: [PATCH 2/2] cgicc-config: add SYSROOT support + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + 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 |