svn commit: r435847 - in head/databases/leveldb: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Mar 10 22:44:43 2017
New Revision: 435847
URL: https://svnweb.freebsd.org/changeset/ports/435847

Log:
  Run configure script in configure stage

Modified:
  head/databases/leveldb/Makefile
  head/databases/leveldb/files/patch-Makefile

Modified: head/databases/leveldb/Makefile
==============================================================================
--- head/databases/leveldb/Makefile	Fri Mar 10 22:01:16 2017	(r435846)
+++ head/databases/leveldb/Makefile	Fri Mar 10 22:44:43 2017	(r435847)
@@ -14,6 +14,9 @@ LICENSE=	BSD3CLAUSE
 OPTIONS_DEFINE=	GPERFTOOLS SNAPPY
 OPTIONS_DEFAULT=SNAPPY
 
+CONFIGURE_ARGS=	build_config.mk ${WRKSRC}/
+CONFIGURE_SCRIPT=	build_detect_platform
+HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_LDCONFIG=	yes

Modified: head/databases/leveldb/files/patch-Makefile
==============================================================================
--- head/databases/leveldb/files/patch-Makefile	Fri Mar 10 22:01:16 2017	(r435846)
+++ head/databases/leveldb/files/patch-Makefile	Fri Mar 10 22:44:43 2017	(r435847)
@@ -1,6 +1,16 @@
---- Makefile.orig	2016-08-11 14:33:30 UTC
+--- Makefile.orig	2017-03-02 00:08:02 UTC
 +++ Makefile
-@@ -125,12 +125,12 @@ SHARED_VERSION_MINOR = 19
+@@ -15,8 +15,7 @@ OPT ?= -O2 -DNDEBUG
+ #-----------------------------------------------
+ 
+ # detect what platform we're building on
+-$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
+-    ./build_detect_platform build_config.mk ./)
++# $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" ./build_detect_platform build_config.mk ./)
+ # this file is generated by the previous line to set build flags and sources
+ include build_config.mk
+ 
+@@ -126,12 +125,12 @@ SHARED_VERSION_MINOR = 20
  SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
  SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
  SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
@@ -15,7 +25,7 @@
  endif
  
  $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
-@@ -293,7 +293,7 @@ endif
+@@ -294,7 +293,7 @@ endif
  
  $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS)
  	rm -f $@