Commit 3e295e63 authored by James Almer's avatar James Almer

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: 's avatarJames Almer <jamrial@gmail.com>
parent 5ff31bab
...@@ -109,12 +109,6 @@ $(1) := ...@@ -109,12 +109,6 @@ $(1) :=
$(1)-yes := $(1)-yes :=
endef endef
ifdef CONFIG_RAISE_MAJOR
RAISE_MAJOR = 100
else
RAISE_MAJOR = 0
endif
define DOSUBDIR define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/ SUBDIR := $(1)/
......
...@@ -109,7 +109,6 @@ Configuration options: ...@@ -109,7 +109,6 @@ Configuration options:
--enable-gray enable full grayscale support (slower color) --enable-gray enable full grayscale support (slower color)
--disable-swscale-alpha disable alpha channel support in swscale --disable-swscale-alpha disable alpha channel support in swscale
--disable-all disable building components, libraries and programs --disable-all disable building components, libraries and programs
--enable-raise-major increase major version numbers in sonames [no]
Program options: Program options:
--disable-programs do not build command line programs --disable-programs do not build command line programs
...@@ -1692,7 +1691,6 @@ CONFIG_LIST=" ...@@ -1692,7 +1691,6 @@ CONFIG_LIST="
neon_clobber_test neon_clobber_test
ossfuzz ossfuzz
pic pic
raise_major
thumb thumb
valgrind_backtrace valgrind_backtrace
xmm_clobber_test xmm_clobber_test
......
...@@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o ...@@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
$$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< $(RAISE_MAJOR) > $$@ $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@
$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR) $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR)
$$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
......
...@@ -5,10 +5,8 @@ toupper(){ ...@@ -5,10 +5,8 @@ toupper(){
name=lib$1 name=lib$1
ucname=$(toupper ${name}) ucname=$(toupper ${name})
file=$2 file=$2
raise_major=$3
eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
eval ${ucname}_VERSION_MAJOR=$((${ucname}_VERSION_MAJOR+${raise_major}))
eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO
eval echo "${name}_VERSION=\$${ucname}_VERSION" eval echo "${name}_VERSION=\$${ucname}_VERSION"
eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR" eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment