[PATCH] build: Explict libtool tag. Preserve CFLAGS/CPPFLAGS.

[PATCH] build: Explict libtool tag. Preserve CFLAGS/CPPFLAGS.

[Arkadiusz Miśkiewicz]

Use explict libtool CC tag (sometimes libtool can't decide what tag is
correct one if omited).

Preserve CFLAGS/CPPFLAGS to allow:
CPPFLAGS="-I$HOME/here-is-xfsprogs-installed/include" \
LDFLAGS="-L$HOME/here-is-xfsprogs-installed/lib" \
./configure  ...

Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
---
 include/builddefs.in |    4 +++-
 include/buildmacros  |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/builddefs.in b/include/builddefs.in
index d855c89..636f632 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -11,6 +11,8 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 LOADERFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LIBXFS = @libxfs@
 LIBACL = @libacl@
@@ -75,7 +77,7 @@ ifeq ($(PKG_PLATFORM),freebsd)
 DEPENDFLAGS = -D__FreeBSD__
 endif
 
-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
+GCFLAGS = $(OPTIMIZER) $(DEBUG) $(CPPFLAGS) \
 	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
 
 # Global, Platform, Local CFLAGS
diff --git a/include/buildmacros b/include/buildmacros
index 801bcb6..276d2c8 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -41,10 +41,10 @@ LIBNAME = $(basename $(LTLIBRARY))
 LTOBJECTS = $(OBJECTS:.o=.lo)
 LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-LTLINK = $(LIBTOOL) --mode=link $(CC)
+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
 LTEXEC = $(LIBTOOL) --mode=execute
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
 
 ifeq ($(ENABLE_SHARED),yes)
 LTLDFLAGS += -rpath $(PKG_LIB_DIR)
-- 
1.6.1.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] build: Explict libtool tag. Preserve CFLAGS/CPPFLAGS.

[Eric Sandeen]

Arkadiusz Miśkiewicz wrote:
> Use explict libtool CC tag (sometimes libtool can't decide what tag is
> correct one if omited).

Seems good to me.  I'll push this on the kernel.org repo, thanks.

(This is against xfstests, based on irc conversation) :)

-Eric

> Preserve CFLAGS/CPPFLAGS to allow:
> CPPFLAGS="-I$HOME/here-is-xfsprogs-installed/include" \
> LDFLAGS="-L$HOME/here-is-xfsprogs-installed/lib" \
> ./configure  ...
> 
> Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
> ---
>  include/builddefs.in |    4 +++-
>  include/buildmacros  |    4 ++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/include/builddefs.in b/include/builddefs.in
> index d855c89..636f632 100644
> --- a/include/builddefs.in
> +++ b/include/builddefs.in
> @@ -11,6 +11,8 @@ DEBUG = @debug_build@
>  OPTIMIZER = @opt_build@
>  MALLOCLIB = @malloc_lib@
>  LOADERFLAGS = @LDFLAGS@
> +CFLAGS = @CFLAGS@
> +CPPFLAGS = @CPPFLAGS@
>  
>  LIBXFS = @libxfs@
>  LIBACL = @libacl@
> @@ -75,7 +77,7 @@ ifeq ($(PKG_PLATFORM),freebsd)
>  DEPENDFLAGS = -D__FreeBSD__
>  endif
>  
> -GCFLAGS = $(OPTIMIZER) $(DEBUG) \
> +GCFLAGS = $(OPTIMIZER) $(DEBUG) $(CPPFLAGS) \
>  	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
>  
>  # Global, Platform, Local CFLAGS
> diff --git a/include/buildmacros b/include/buildmacros
> index 801bcb6..276d2c8 100644
> --- a/include/buildmacros
> +++ b/include/buildmacros
> @@ -41,10 +41,10 @@ LIBNAME = $(basename $(LTLIBRARY))
>  LTOBJECTS = $(OBJECTS:.o=.lo)
>  LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>  
> -LTLINK = $(LIBTOOL) --mode=link $(CC)
> +LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
>  LTEXEC = $(LIBTOOL) --mode=execute
>  LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
> -LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
> +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
>  
>  ifeq ($(ENABLE_SHARED),yes)
>  LTLDFLAGS += -rpath $(PKG_LIB_DIR)

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs