diff mbox

[2/2] doc: api guide: just use ARCH_DIR, drop WITH_ARCH

Message ID 1462807741-2411-1-git-send-email-mike.holmes@linaro.org
State New
Headers show

Commit Message

Mike Holmes May 9, 2016, 3:29 p.m. UTC 
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 configure.ac                          | 1 -
 doc/application-api-guide/doxygen.cfg | 2 +-
 m4/ax_prog_doxygen.m4                 | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

Comments

Bill Fischofer May 9, 2016, 3:40 p.m. UTC | #1 
This patch applies and builds fine by itself, but when combined with your
previous patch I get this on 32-bit systems:

bill@Ub16-32:~/linaro/mikepatch$ make
Making all in platform/linux-generic
make[1]: Entering directory
'/home/bill/linaro/mikepatch/platform/linux-generic'
  CC       odp_atomic.lo
In file included from ./include/odp/api/atomic.h:20:0,
                 from odp_atomic.c:7:
./include/odp/api/align.h:55:30: fatal error: odp/api/cpu_arch.h: No such
file or directory
compilation terminated.
Makefile:825: recipe for target 'odp_atomic.lo' failed
make[1]: *** [odp_atomic.lo] Error 1
make[1]: Leaving directory
'/home/bill/linaro/mikepatch/platform/linux-generic'
Makefile:468: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1


On Mon, May 9, 2016 at 10:29 AM, Mike Holmes <mike.holmes@linaro.org> wrote:

> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>

> ---

>  configure.ac                          | 1 -

>  doc/application-api-guide/doxygen.cfg | 2 +-

>  m4/ax_prog_doxygen.m4                 | 2 +-

>  3 files changed, 2 insertions(+), 3 deletions(-)

>

> diff --git a/configure.ac b/configure.ac

> index 3ea33ea..b95bcbd 100644

> --- a/configure.ac

> +++ b/configure.ac

> @@ -244,7 +244,6 @@ AC_MSG_RESULT([

>         libdir:                 ${libdir}

>         includedir:             ${includedir}

>         testdir:                ${testdir}

> -       WITH_ARCH:              ${WITH_ARCH}

>

>         cc:                     ${CC}

>         cppflags:               ${CPPFLAGS}

> diff --git a/doc/application-api-guide/doxygen.cfg

> b/doc/application-api-guide/doxygen.cfg

> index c3caf89..c320bae 100644

> --- a/doc/application-api-guide/doxygen.cfg

> +++ b/doc/application-api-guide/doxygen.cfg

> @@ -14,7 +14,7 @@ INPUT = $(SRCDIR)/doc \

>         $(SRCDIR)/doc/users-guide \

>         $(SRCDIR)/include \

>         $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \

> -       $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH)

> +       $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(ARCH_DIR)

>  FILE_PATTERNS = *.h odp*.c *.dox

>  RECURSIVE = YES

>  SOURCE_BROWSER = YES

> diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4

> index 67acd22..b0d1d27 100644

> --- a/m4/ax_prog_doxygen.m4

> +++ b/m4/ax_prog_doxygen.m4

> @@ -272,7 +272,7 @@ DX_ENV_APPEND(VERSION, $VERSION)

>  DX_ENV_APPEND(WITH_PLATFORM, $with_platform)

>  DX_ENV_APPEND(PROJECT, $DX_PROJECT)

>  DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)

> -DX_ENV_APPEND(WITH_ARCH, $ARCH)

> +DX_ENV_APPEND(ARCH_DIR, $ARCH_DIR)

>

>  # Doxygen itself:

>  DX_ARG_ABLE(doc, [generate any doxygen documentation],

> --

> 2.7.4

>

> _______________________________________________

> lng-odp mailing list

> lng-odp@lists.linaro.org

> https://lists.linaro.org/mailman/listinfo/lng-odp

>
Mike Holmes May 9, 2016, 3:51 p.m. UTC | #2 
On 9 May 2016 at 11:40, Bill Fischofer <bill.fischofer@linaro.org> wrote:

> This patch applies and builds fine by itself, but when combined with your

> previous patch I get this on 32-bit systems:

>

> bill@Ub16-32:~/linaro/mikepatch$ make

> Making all in platform/linux-generic

> make[1]: Entering directory

> '/home/bill/linaro/mikepatch/platform/linux-generic'

>   CC       odp_atomic.lo

> In file included from ./include/odp/api/atomic.h:20:0,

>                  from odp_atomic.c:7:

> ./include/odp/api/align.h:55:30: fatal error: odp/api/cpu_arch.h: No such

> file or directory

> compilation terminated.

> Makefile:825: recipe for target 'odp_atomic.lo' failed

> make[1]: *** [odp_atomic.lo] Error 1

> make[1]: Leaving directory

> '/home/bill/linaro/mikepatch/platform/linux-generic'

> Makefile:468: recipe for target 'all-recursive' failed

> make: *** [all-recursive] Error 1

>


Interesting, I have it in the same repo.


>

>

> On Mon, May 9, 2016 at 10:29 AM, Mike Holmes <mike.holmes@linaro.org>

> wrote:

>

>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>

>> ---

>>  configure.ac                          | 1 -

>>  doc/application-api-guide/doxygen.cfg | 2 +-

>>  m4/ax_prog_doxygen.m4                 | 2 +-

>>  3 files changed, 2 insertions(+), 3 deletions(-)

>>

>> diff --git a/configure.ac b/configure.ac

>> index 3ea33ea..b95bcbd 100644

>> --- a/configure.ac

>> +++ b/configure.ac

>> @@ -244,7 +244,6 @@ AC_MSG_RESULT([

>>         libdir:                 ${libdir}

>>         includedir:             ${includedir}

>>         testdir:                ${testdir}

>> -       WITH_ARCH:              ${WITH_ARCH}

>>

>>         cc:                     ${CC}

>>         cppflags:               ${CPPFLAGS}

>> diff --git a/doc/application-api-guide/doxygen.cfg

>> b/doc/application-api-guide/doxygen.cfg

>> index c3caf89..c320bae 100644

>> --- a/doc/application-api-guide/doxygen.cfg

>> +++ b/doc/application-api-guide/doxygen.cfg

>> @@ -14,7 +14,7 @@ INPUT = $(SRCDIR)/doc \

>>         $(SRCDIR)/doc/users-guide \

>>         $(SRCDIR)/include \

>>         $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \

>> -       $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH)

>> +       $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(ARCH_DIR)

>>  FILE_PATTERNS = *.h odp*.c *.dox

>>  RECURSIVE = YES

>>  SOURCE_BROWSER = YES

>> diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4

>> index 67acd22..b0d1d27 100644

>> --- a/m4/ax_prog_doxygen.m4

>> +++ b/m4/ax_prog_doxygen.m4

>> @@ -272,7 +272,7 @@ DX_ENV_APPEND(VERSION, $VERSION)

>>  DX_ENV_APPEND(WITH_PLATFORM, $with_platform)

>>  DX_ENV_APPEND(PROJECT, $DX_PROJECT)

>>  DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)

>> -DX_ENV_APPEND(WITH_ARCH, $ARCH)

>> +DX_ENV_APPEND(ARCH_DIR, $ARCH_DIR)

>>

>>  # Doxygen itself:

>>  DX_ARG_ABLE(doc, [generate any doxygen documentation],

>> --

>> 2.7.4

>>

>> _______________________________________________

>> lng-odp mailing list

>> lng-odp@lists.linaro.org

>> https://lists.linaro.org/mailman/listinfo/lng-odp

>>

>

>



-- 
Mike Holmes
Technical Manager - Linaro Networking Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
"Work should be fun and collaborative, the rest follows"
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 3ea33ea..b95bcbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,6 @@  AC_MSG_RESULT([
 	libdir:			${libdir}
 	includedir:		${includedir}
 	testdir:		${testdir}
-	WITH_ARCH:              ${WITH_ARCH}
 
 	cc:			${CC}
 	cppflags:		${CPPFLAGS}
diff --git a/doc/application-api-guide/doxygen.cfg b/doc/application-api-guide/doxygen.cfg
index c3caf89..c320bae 100644
--- a/doc/application-api-guide/doxygen.cfg
+++ b/doc/application-api-guide/doxygen.cfg
@@ -14,7 +14,7 @@  INPUT = $(SRCDIR)/doc \
 	$(SRCDIR)/doc/users-guide \
 	$(SRCDIR)/include \
 	$(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \
-	$(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH)
+	$(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(ARCH_DIR)
 FILE_PATTERNS = *.h odp*.c *.dox
 RECURSIVE = YES
 SOURCE_BROWSER = YES
diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4
index 67acd22..b0d1d27 100644
--- a/m4/ax_prog_doxygen.m4
+++ b/m4/ax_prog_doxygen.m4
@@ -272,7 +272,7 @@  DX_ENV_APPEND(VERSION, $VERSION)
 DX_ENV_APPEND(WITH_PLATFORM, $with_platform)
 DX_ENV_APPEND(PROJECT, $DX_PROJECT)
 DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
-DX_ENV_APPEND(WITH_ARCH, $ARCH)
+DX_ENV_APPEND(ARCH_DIR, $ARCH_DIR)
 
 # Doxygen itself:
 DX_ARG_ABLE(doc, [generate any doxygen documentation],