Browse code

build: remove --enable-raise-major configure option

It's not used by anything, has dubious usefulness, the reasons for which
it was introduced are no longer valid, and only serves to add complexity
to the build system.

Signed-off-by: James Almer <jamrial@gmail.com>

James Almer authored on 2017/05/07 06:50:09
Showing 4 changed files
... ...
@@ -109,12 +109,6 @@ $(1) :=
109 109
 $(1)-yes :=
110 110
 endef
111 111
 
112
-ifdef CONFIG_RAISE_MAJOR
113
-RAISE_MAJOR = 100
114
-else
115
-RAISE_MAJOR = 0
116
-endif
117
-
118 112
 define DOSUBDIR
119 113
 $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
120 114
 SUBDIR := $(1)/
... ...
@@ -109,7 +109,6 @@ Configuration options:
109 109
   --enable-gray            enable full grayscale support (slower color)
110 110
   --disable-swscale-alpha  disable alpha channel support in swscale
111 111
   --disable-all            disable building components, libraries and programs
112
-  --enable-raise-major     increase major version numbers in sonames [no]
113 112
 
114 113
 Program options:
115 114
   --disable-programs       do not build command line programs
... ...
@@ -1692,7 +1691,6 @@ CONFIG_LIST="
1692 1692
     neon_clobber_test
1693 1693
     ossfuzz
1694 1694
     pic
1695
-    raise_major
1696 1695
     thumb
1697 1696
     valgrind_backtrace
1698 1697
     xmm_clobber_test
... ...
@@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
34 34
 	$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
35 35
 
36 36
 $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
37
-	$$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< $(RAISE_MAJOR) > $$@
37
+	$$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@
38 38
 
39 39
 $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR)
40 40
 	$$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
... ...
@@ -5,10 +5,8 @@ toupper(){
5 5
 name=lib$1
6 6
 ucname=$(toupper ${name})
7 7
 file=$2
8
-raise_major=$3
9 8
 
10 9
 eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
11
-eval ${ucname}_VERSION_MAJOR=$((${ucname}_VERSION_MAJOR+${raise_major}))
12 10
 eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO
13 11
 eval echo "${name}_VERSION=\$${ucname}_VERSION"
14 12
 eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR"