diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-util/astyle/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-util/astyle/files')
| -rw-r--r-- | dev-util/astyle/files/astyle-2.02.1-build_system.patch | 54 | ||||
| -rw-r--r-- | dev-util/astyle/files/astyle-2.05.1-build_system.patch | 56 |
2 files changed, 110 insertions, 0 deletions
diff --git a/dev-util/astyle/files/astyle-2.02.1-build_system.patch b/dev-util/astyle/files/astyle-2.02.1-build_system.patch new file mode 100644 index 000000000000..1d63a512e9bc --- /dev/null +++ b/dev-util/astyle/files/astyle-2.02.1-build_system.patch @@ -0,0 +1,54 @@ +--- a/build/gcc/Makefile ++++ b/build/gcc/Makefile +@@ -34,25 +34,25 @@ + ipath=$(prefix)/bin + CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions + JAVAINCS = -I$(JAVA_HOME)/include +-CXX = g++ ++CXX ?= g++ + INSTALL=install -o $(USER) -g $(USER) + + ################################################## + + # define compile options for each build +-ifdef CFLAGS +- CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CFLAGS) +- CFLAGSd = -g $(CBASEFLAGS) $(CFLAGS) ++ifdef CXXFLAGS ++ CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS) ++ CFLAGSd = -g $(CBASEFLAGS) $(CXXFLAGS) + else + CFLAGSr = -DNDEBUG -O3 $(CBASEFLAGS) + CFLAGSd = -g $(CBASEFLAGS) + endif +-CFLAGSs = -DASTYLE_LIB -fpic $(CFLAGSr) +-CFLAGSsd = -DASTYLE_LIB -fpic $(CFLAGSd) ++CFLAGSs = -DASTYLE_LIB -fPIC $(CFLAGSr) ++CFLAGSsd = -DASTYLE_LIB -fPIC $(CFLAGSd) + CFLAGSa = -DASTYLE_LIB $(CFLAGSr) + CFLAGSad = -DASTYLE_LIB $(CFLAGSd) +-CFLAGSsj = -DASTYLE_JNI -fpic $(CFLAGSr) $(JAVAINCS) +-CFLAGSsjd = -DASTYLE_JNI -fpic $(CFLAGSd) $(JAVAINCS) ++CFLAGSsj = -DASTYLE_JNI -fPIC $(CFLAGSr) $(JAVAINCS) ++CFLAGSsjd = -DASTYLE_JNI -fPIC $(CFLAGSd) $(JAVAINCS) + + # define link options + ifdef LDFLAGS +@@ -134,7 +134,7 @@ + shared: libastyle.so + libastyle.so: $(OBJs) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^ + @ echo + + shareddebug: libastyled.so +@@ -158,7 +158,7 @@ + java: libastylej.so + libastylej.so: $(OBJsj) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^ + @ echo + + javadebug: libastylejd.so diff --git a/dev-util/astyle/files/astyle-2.05.1-build_system.patch b/dev-util/astyle/files/astyle-2.05.1-build_system.patch new file mode 100644 index 000000000000..23554499c798 --- /dev/null +++ b/dev-util/astyle/files/astyle-2.05.1-build_system.patch @@ -0,0 +1,56 @@ +diff --git a/build/gcc/Makefile b/build/gcc/Makefile +index b1af4c1..1dfa021 100755 +--- a/build/gcc/Makefile ++++ b/build/gcc/Makefile +@@ -34,15 +34,15 @@ objdir = obj + ipath=$(prefix)/bin + CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions + JAVAINCS = -I$(JAVA_HOME)/include +-CXX = g++ ++CXX ?= g++ + INSTALL=install -o $(USER) -g $(USER) + + ################################################## + + # define compile options for each build +-ifdef CFLAGS +- CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CFLAGS) +- CFLAGSd = -g $(CBASEFLAGS) $(CFLAGS) ++ifdef CXXFLAGS ++ CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS) ++ CFLAGSd = -g $(CBASEFLAGS) $(CXXFLAGS) + else + CFLAGSr = -DNDEBUG -O3 $(CBASEFLAGS) + CFLAGSd = -g $(CBASEFLAGS) +@@ -134,13 +134,13 @@ astyled: $(OBJd) + shared: libastyle-2.05.1.so + libastyle-2.05.1.so: $(OBJs) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ + @ echo + + shareddebug: libastyle-2.05.1d.so + libastyle-2.05.1d.so: $(OBJsd) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ + @ echo + + static: libastyle.a +@@ -158,13 +158,13 @@ libastyled.a: $(OBJad) + java: libastyle-2.05.1j.so + libastyle-2.05.1j.so: $(OBJsj) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ + @ echo + + javadebug: libastyle-2.05.1jd.so + libastyle-2.05.1jd.so: $(OBJsjd) + @ mkdir -p $(bindir) +- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^ ++ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ + @ echo + + all: release debug shared shareddebug static staticdebug |