diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-06 18:50:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-17 22:52:59 -0300 |
| commit | 3e295e633c36f601fb3dbee533d7b5dfc8c77bef (patch) | |
| tree | d553e98c35f885ad0b171c2759ca3ec535399446 | |
| parent | 5ff31babfccd16cdee6575ae015ff67e9a08e35d (diff) | |
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>
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | ffbuild/library.mak | 2 | ||||
| -rwxr-xr-x | ffbuild/libversion.sh | 2 |
4 files changed, 1 insertions, 11 deletions
@@ -109,12 +109,6 @@ $(1) := $(1)-yes := endef -ifdef CONFIG_RAISE_MAJOR -RAISE_MAJOR = 100 -else -RAISE_MAJOR = 0 -endif - define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ @@ -109,7 +109,6 @@ Configuration options: --enable-gray enable full grayscale support (slower color) --disable-swscale-alpha disable alpha channel support in swscale --disable-all disable building components, libraries and programs - --enable-raise-major increase major version numbers in sonames [no] Program options: --disable-programs do not build command line programs @@ -1692,7 +1691,6 @@ CONFIG_LIST=" neon_clobber_test ossfuzz pic - raise_major thumb valgrind_backtrace xmm_clobber_test diff --git a/ffbuild/library.mak b/ffbuild/library.mak index cfc2d36067..22f1e4c37f 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(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) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh index 687adf28bc..990ce9f640 100755 --- a/ffbuild/libversion.sh +++ b/ffbuild/libversion.sh @@ -5,10 +5,8 @@ toupper(){ name=lib$1 ucname=$(toupper ${name}) file=$2 -raise_major=$3 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 echo "${name}_VERSION=\$${ucname}_VERSION" eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR" |