shared-macros.mk: simplify java settings
[oi-userland.git] / components / library / xmlrpc-c / patches / 01-build.patch
blobff4cea699dcca13a4d616eb3c511888f3f149042
1 --- xmlrpc-c-1.39.12/common.mk.~1~ 2015-12-30 07:22:14.000000000 +0300
2 +++ xmlrpc-c-1.39.12/common.mk 2017-03-30 15:24:12.733133305 +0300
3 @@ -17,7 +17,7 @@
4 # fully made.
5 .DELETE_ON_ERROR:
7 -GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef -Wimplicit \
8 +GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef \
9 -Wno-unknown-pragmas
10 # We need -Wwrite-strings after we fix all the missing consts
12 @@ -48,6 +48,10 @@
13 CFLAGS_COMMON = -DNDEBUG
14 CXXFLAGS_COMMON = -DNDEBUG
16 +CFLAGS_COMMON += $(CFLAGS)
17 +CPPFLAGS_COMMON += $(CPPFLAGS)
18 +CXXFLAGS_COMMON += $(CXXFLAGS)
20 ifeq ($(C_COMPILER_GNU),yes)
21 CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
22 endif
23 @@ -323,10 +327,10 @@
24 endif
26 CFLAGS_ALL = $(CFLAGS_COMMON) $(CFLAGS_LOCAL) \
27 - $(INCLUDES) $(CFLAGS_PERSONAL) $(CFLAGS)
28 + $(INCLUDES) $(CFLAGS_PERSONAL) $(CFLAGS) $(CPPFLAGS_COMMON)
30 CXXFLAGS_ALL = $(CXXFLAGS_COMMON) $(CFLAGS_LOCAL) \
31 - $(INCLUDES) $(CFLAGS_PERSONAL) $(CXXFLAGS)
32 + $(INCLUDES) $(CFLAGS_PERSONAL) $(CXXFLAGS) $(CPPFLAGS_COMMON)
35 $(TARGET_MODS:%=%.o):%.o:%.c
36 --- xmlrpc-c-1.39.12/config.mk.in.~1~ 2015-12-30 07:22:14.000000000 +0300
37 +++ xmlrpc-c-1.39.12/config.mk.in 2017-03-30 15:39:55.555377528 +0300
38 @@ -195,9 +195,8 @@
40 # Solaris compiler (Sun C 5.5) can't take multiple ld options as
41 # -Wl,-a,-b . Ld sees -a,-b in that case.
42 - LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
43 - CFLAGS_SHLIB = -Kpic
44 - NEED_RPATH=yes
45 + LDFLAGS_SHLIB = -shared -Wl,-h -Wl,$(SONAME)
46 + CFLAGS_SHLIB = -fPIC
47 endif
49 ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix)