mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 21:08:35 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
--- jni/GNUmakefile
|
|
+++ jni/GNUmakefile
|
|
@@ -41,6 +41,7 @@
|
|
JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
|
|
|
|
ifeq ($(USE_SYSTEM_LIBFFI),1)
|
|
+ LIBFFI =
|
|
LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
|
|
LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
|
|
else
|
|
@@ -64,9 +65,8 @@
|
|
OFLAGS = -O2 $(JFLAGS)
|
|
|
|
# MacOS headers aren't completely warning free, so turn them off
|
|
-WERROR = -Werror
|
|
ifneq ($(OS),darwin)
|
|
- WFLAGS += -Wundef $(WERROR)
|
|
+ WFLAGS += -Wundef
|
|
endif
|
|
WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
|
|
PICFLAGS = -fPIC
|
|
@@ -279,7 +279,7 @@
|
|
@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
|
|
@echo "OBJS=$(OBJS)"
|
|
|
|
-$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
|
|
+$(LIBJFFI): $(OBJS) $(LIBFFI)
|
|
$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
|
|
$(STRIP) $@
|
|
|
|
@@ -291,7 +291,7 @@
|
|
@mkdir -p $(@D)
|
|
@$(CC) $(CFLAGS) -o $@ -c $<
|
|
|
|
-$(OBJS) : $(LIBFFI_LIBS)
|
|
+$(OBJS) : $(LIBFFI)
|
|
|
|
ifeq ($(OS), darwin)
|
|
build_ffi = \
|
|
--- libtest/GNUmakefile
|
|
+++ libtest/GNUmakefile
|
|
@@ -44,8 +44,8 @@
|
|
# Compiler/linker flags from:
|
|
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
|
|
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
|
|
-OFLAGS = -O2 $(JFLAGS)
|
|
-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
|
|
+OFLAGS = $(JFLAGS)
|
|
+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
|
|
PICFLAGS = -fPIC
|
|
SOFLAGS = -shared -Wl,-O1
|
|
LDFLAGS += $(SOFLAGS)
|