This is an automated email from the git hooks/post-receive script. tpot-guest pushed a commit to tag 0.6.5 in repository jffi-next.
commit 2a1ea714b9cb63cfe8f4401262780595f832c981 Author: Wayne Meissner <[email protected]> Date: Mon Feb 1 11:35:23 2010 +1000 Can now set LIBFFI_CFLAGS and LIBFFI_LIBS when calling make, and it will use those instead of pkg-config Conflicts: jni/GNUmakefile --- jni/GNUmakefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jni/GNUmakefile b/jni/GNUmakefile index dea508d..cefe2bf 100755 --- a/jni/GNUmakefile +++ b/jni/GNUmakefile @@ -40,12 +40,13 @@ JFFI_SRC_DIR = $(SRC_DIR)/jffi JFFI_BUILD_DIR = $(BUILD_DIR)/jffi ifeq ($(USE_SYSTEM_LIBFFI),1) - LIBFFI = $(shell pkg-config --libs libffi) - LIBFFI_CFLAGS = $(shell pkg-config --cflags libffi) + LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) + LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) else LIBFFI_SRC_DIR = $(SRC_DIR)/libffi LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(PLATFORM) LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.a + LIBFFI_LIBS=$(LIBFFI) LIBFFI_CFLAGS = -I"$(LIBFFI_BUILD_DIR)"/include endif @@ -218,15 +219,15 @@ debug: @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" @echo "OBJS=$(OBJS)" -$(LIBJFFI): $(LIBFFI) $(OBJS) - $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) +$(LIBJFFI): $(OBJS) $(CXXOBJS) $(LIBFFI_LIBS) + $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(STRIP) $@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c jffi.h @mkdir -p $(@D) $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o : $(LIBFFI) +$(OBJS) : $(LIBFFI_LIBS) ifeq ($(OS), darwin) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-next.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
