netsurf: branch master updated. release/3.0-69-gd34f03e

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Sun May 12 20:41:58 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/d34f03e69ef241db4eac442bce5d1143920bc3da
...commit http://git.netsurf-browser.org/netsurf.git/commit/d34f03e69ef241db4eac442bce5d1143920bc3da
...tree http://git.netsurf-browser.org/netsurf.git/tree/d34f03e69ef241db4eac442bce5d1143920bc3da

The branch, master has been updated
       via  d34f03e69ef241db4eac442bce5d1143920bc3da (commit)
      from  ba0cf5c949cd467dca4e4c777bfdfaf36edad47a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d34f03e69ef241db4eac442bce5d1143920bc3da
commit d34f03e69ef241db4eac442bce5d1143920bc3da
Author: Vincent Sanders <vince at netsurf-browser.org>
Commit: Vincent Sanders <vince at netsurf-browser.org>

    add framebuffer cross compiling support

diff --git a/Makefile b/Makefile
index df13b5e..32b1afd 100644
--- a/Makefile
+++ b/Makefile
@@ -271,8 +271,21 @@ else
                 CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
               endif
 	    else
-              # All other targets (GTK, Framebuffer)
-              PKG_CONFIG := pkg-config
+              ifeq ($(findstring framebuffer,$(TARGET)),framebuffer)
+                ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+                  PKG_CONFIG := pkg-config
+                else
+                  PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config                
+                endif
+
+                ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+                  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+                  CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+                endif
+              else
+                # All native targets (GTK)
+                PKG_CONFIG := pkg-config
+              endif
             endif
           endif
         endif


-----------------------------------------------------------------------

Summary of changes:
 Makefile |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index df13b5e..32b1afd 100644
--- a/Makefile
+++ b/Makefile
@@ -271,8 +271,21 @@ else
                 CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
               endif
 	    else
-              # All other targets (GTK, Framebuffer)
-              PKG_CONFIG := pkg-config
+              ifeq ($(findstring framebuffer,$(TARGET)),framebuffer)
+                ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+                  PKG_CONFIG := pkg-config
+                else
+                  PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config                
+                endif
+
+                ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+                  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+                  CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+                endif
+              else
+                # All native targets (GTK)
+                PKG_CONFIG := pkg-config
+              endif
             endif
           endif
         endif


-- 
NetSurf Browser



More information about the netsurf-commits mailing list