mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
48f4591035
- Clean up the Makefile. - Follow some upstream recommendations (--with-data-packaging=archive, --disable-renaming, -DICU_NO_USER_DATA_OVERRIDE). - Patch makefiles to install static libraries with INSTALL_DATA so they aren't stripped. - Patch config/mh-bsd-gcc to sync with config/mh-linux-gcc. - Fix endianness detection in ICU. The code wanted to use BYTE_ORDER defined in machine/endian.h, but this isn't visible because ICU is compiled with _XOPEN_SOURCE. Patch the code to use _BYTE_ORDER instead. - Compile ICU with C++11 compiler to enable move constructors. - Patch ICU to fix a problem with atomics in the case of a C++11 compiler without C++11 header <atomic> (like Clang on FreeBSD 9). - Bump all ports that depend on it due to library version change. - Add USES=compiler:c++0x to some ports that pick up -std=c++0x from ICU pkgconfig files. - Add USES=compiler:c++11-lib to graphics/libcdr01 because it also needs a C++11 runtime library now. Add this to all ports that depend on it so their executables load the right libstdc++.so on FreeBSD 9. PR: 205120 Exp-run by: antoine Approved by: portmgr (antoine)
82 lines
2.6 KiB
Text
82 lines
2.6 KiB
Text
--- config/mh-bsd-gcc.orig 2016-03-23 20:50:50 UTC
|
|
+++ config/mh-bsd-gcc
|
|
@@ -4,8 +4,8 @@
|
|
## others. All Rights Reserved.
|
|
|
|
## Commands to generate dependency files
|
|
-GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
|
-GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
|
|
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
|
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
|
|
|
|
## Flags for position independent code
|
|
SHAREDLIBCFLAGS = -fPIC
|
|
@@ -18,10 +18,16 @@ LIBCPPFLAGS =
|
|
|
|
## Compiler switch to embed a runtime search path
|
|
LD_RPATH=
|
|
-LD_RPATH_PRE= -Wl,-rpath,
|
|
+LD_RPATH_PRE = -Wl,-rpath,
|
|
+
|
|
+## These are the library specific LDFLAGS
|
|
+LDFLAGSICUDT=-nodefaultlibs -nostdlib
|
|
|
|
## Compiler switch to embed a library name
|
|
-LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
|
|
+# The initial tab in the next line is to prevent icu-config from reading it.
|
|
+ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
|
|
+#SH# # We can't depend on MIDDLE_SO_TARGET being set.
|
|
+#SH# LD_SONAME=
|
|
|
|
## Shared library options
|
|
LD_SOOPTIONS= -Wl,-Bsymbolic
|
|
@@ -33,27 +39,27 @@ STATIC_O = ao
|
|
|
|
## Compilation rules
|
|
%.$(STATIC_O): $(srcdir)/%.c
|
|
- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
|
|
+ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -o $@ $<)
|
|
%.o: $(srcdir)/%.c
|
|
- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
|
|
+ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -o $@ $<)
|
|
|
|
%.$(STATIC_O): $(srcdir)/%.cpp
|
|
- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
|
|
+ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -o $@ $<)
|
|
%.o: $(srcdir)/%.cpp
|
|
- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
|
|
+ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -o $@ $<)
|
|
|
|
|
|
## Dependency rules
|
|
%.d: $(srcdir)/%.c
|
|
- @echo "generating dependency information for $<"
|
|
+ $(call ICU_MSG,(deps)) $<
|
|
@$(SHELL) -ec '$(GEN_DEPS.c) $< \
|
|
- | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
|
|
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
|
[ -s $@ ] || rm -f $@'
|
|
|
|
%.d: $(srcdir)/%.cpp
|
|
- @echo "generating dependency information for $<"
|
|
+ $(call ICU_MSG,(deps)) $<
|
|
@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
|
|
- | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
|
|
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
|
[ -s $@ ] || rm -f $@'
|
|
|
|
## Versioned libraries rules
|
|
@@ -64,7 +70,7 @@ STATIC_O = ao
|
|
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
|
|
|
|
## Bind internal references
|
|
-
|
|
+
|
|
# LDflags that pkgdata will use
|
|
BIR_LDFLAGS= -Wl,-Bsymbolic
|
|
|
|
@@ -77,4 +83,3 @@ STATIC_PREFIX =
|
|
|
|
## End BSD-specific setup
|
|
|
|
-
|