Changeset 7272


Ignorieren:
Zeitstempel:
05.07.2011 22:27:51 (vor 7 Jahren)
Autor:
er13
Nachricht:

git:

  • allow git to be built with pcre support
Ort:
trunk/make/git
Dateien:
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/git/Config.in

    r7271 r7272  
    1313        unusually rich command set that provides both high-level operations 
    1414        and full access to internals. 
     15 
     16config FREETZ_PACKAGE_GIT_WITH_PCRE 
     17    bool "build with pcre support" 
     18    depends on FREETZ_PACKAGE_GIT 
     19    select FREETZ_LIB_libpcre 
     20    default n 
     21    help 
     22        With this option enabled git-grep will be able to use 
     23        Perl-compatible regular expressions (pcre). 
     24 
     25        Note: git supports all kinds of POSIX regular expressions 
     26        without libpcre. Most users want say no here. 
  • trunk/make/git/git.mk

    r7271 r7272  
    1717endif 
    1818 
     19$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_GIT_WITH_PCRE 
     20 
    1921$(PKG)_CONFIGURE_ENV += ac_cv_c_c99_format=yes 
    2022$(PKG)_CONFIGURE_ENV += ac_cv_fread_reads_directories=no 
     
    2729$(PKG)_CONFIGURE_OPTIONS += --with-iconv 
    2830$(PKG)_CONFIGURE_OPTIONS += --with-openssl 
     31ifeq ($(strip $(FREETZ_PACKAGE_GIT_WITH_PCRE)),y) 
     32$(PKG)_CONFIGURE_OPTIONS += --with-libpcre="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" 
     33endif 
    2934$(PKG)_CONFIGURE_OPTIONS += --with-zlib="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" 
    3035$(PKG)_CONFIGURE_OPTIONS += --without-perl 
  • trunk/make/git/patches/030-no_rpath.patch

    r7271 r7272  
    4444 ifdef NO_LIBGEN_H 
    4545    COMPAT_CFLAGS += -DNO_LIBGEN_H 
     46@@ -1268,7 +1268,7 @@ 
     47    BASIC_CFLAGS += -DUSE_LIBPCRE 
     48    ifdef LIBPCREDIR 
     49        BASIC_CFLAGS += -I$(LIBPCREDIR)/include 
     50-       EXTLIBS += -L$(LIBPCREDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBPCREDIR)/$(lib) 
     51+       EXTLIBS += -L$(LIBPCREDIR)/$(lib) 
     52    endif 
     53    EXTLIBS += -lpcre 
     54 endif 
    4655@@ -1282,7 +1273,7 @@ 
    4756    ifdef CURLDIR 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.