llvm.org GIT mirror llvm / db3064e
Add patch level to llvm version in CMake and Autoconf The shared library generated by autoconf will now be called libLLVM-$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(VERSION_SUFFIX).so and a symlink named libLLVM-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX).so will also be created in the install directory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202720 91177308-0d34-0410-b5e6-96231b3b80d8 Tom Stellard 5 years ago
7 changed file(s) with 77 addition(s) and 34 deletion(s). Raw diff Collapse all Expand all
2626
2727 set(LLVM_VERSION_MAJOR 3)
2828 set(LLVM_VERSION_MINOR 5)
29 set(LLVM_VERSION_PATCH 0)
2930
3031 if (NOT PACKAGE_VERSION)
31 set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
32 set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}svn")
3233 endif()
3334
3435 option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
5960 set(CPACK_PACKAGE_VENDOR "LLVM")
6061 set(CPACK_PACKAGE_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
6162 set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_MINOR})
63 set(CPACK_PACKAGE_VERSION_PATCH ${LLVM_VERSION_PATCH})
6264 set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
6365 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.TXT")
6466 if(WIN32 AND NOT UNIX)
1616 LLVMVersion := @PACKAGE_VERSION@
1717 LLVM_VERSION_MAJOR := @LLVM_VERSION_MAJOR@
1818 LLVM_VERSION_MINOR := @LLVM_VERSION_MINOR@
19 LLVM_VERSION_PATCH := @LLVM_VERSION_PATCH@
20 LLVM_VERSION_SUFFIX := @LLVM_VERSION_SUFFIX@
1921 LLVM_CONFIGTIME := @LLVM_CONFIGTIME@
2022
2123 ###########################################################################
786786 Ranlib = ranlib
787787 endif
788788
789 AliasTool = ln -s
789 AliasTool = ln -sf
790790
791791 #----------------------------------------------------------
792792 # Get the list of source files and compute object file
11501150
11511151 # Make sure there isn't any extraneous whitespace on the LIBRARYNAME option
11521152 LIBRARYNAME := $(strip $(LIBRARYNAME))
1153 LIBRARYALIASNAME := $(strip $(LIBRARYALIASNAME))
11531154 ifdef LOADABLE_MODULE
11541155 BaseLibName.A := $(LIBRARYNAME).a
11551156 BaseLibName.SO := $(LIBRARYNAME)$(SHLIBEXT)
1157 BaseAliasName.SO := $(LIBRARYALIASNAME)$(SHLIBEXT)
11561158 else
11571159 BaseLibName.A := lib$(LIBRARYNAME).a
11581160 BaseLibName.SO := $(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)
1161 BaseAliasName.SO := $(SharedPrefix)$(LIBRARYALIASNAME)$(SHLIBEXT)
11591162 endif
11601163 LibName.A := $(LibDir)/$(BaseLibName.A)
11611164 LibName.SO := $(SharedLibDir)/$(BaseLibName.SO)
1165 AliasName.SO := $(SharedLibDir)/$(BaseAliasName.SO)
11621166 LibName.O := $(LibDir)/$(LIBRARYNAME).o
11631167
11641168 #---------------------------------------------------------
12121216 DestSharedLibDir := $(DESTDIR)$(PROJ_libdir)
12131217 endif
12141218 DestSharedLib := $(DestSharedLibDir)/$(BaseLibName.SO)
1219 DestSharedAlias := $(DestSharedLibDir)/$(BaseAliasName.SO)
12151220
12161221 install-local:: $(DestSharedLib)
12171222
12181223 $(DestSharedLib): $(LibName.SO) $(DestSharedLibDir)
12191224 $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
12201225 $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
1226 ifdef SHARED_ALIAS
1227 $(Echo) Creating alias from $(DestSharedLib) to $(DestSharedAlias)
1228 $(Verb) $(AliasTool) $(DestSharedLib) $(DestSharedAlias)
1229 endif
12211230
12221231 uninstall-local::
12231232 $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
3030 dnl===-----------------------------------------------------------------------===
3131 dnl Initialize autoconf and define the package name, version number and
3232 dnl address for reporting bugs.
33 AC_INIT([LLVM],[3.5svn],[http://llvm.org/bugs/])
34 LLVM_DEFINE_SUBST([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
35 LLVM_DEFINE_SUBST([LLVM_VERSION_MINOR], [5], [Minor version of the LLVM API])
33
34 AC_INIT([LLVM],[3.5.0svn],[http://llvm.org/bugs/])
35
36 LLVM_VERSION_MAJOR=3
37 LLVM_VERSION_MINOR=5
38 LLVM_VERSION_PATCH=0
39 LLVM_VERSION_SUFFIX=svn
40
41 AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
42 AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
43 AC_DEFINE_UNQUOTED([LLVM_VERSION_PATCH], $LLVM_VERSION_PATCH, [Patch version of the LLVM API])
44
45 AC_SUBST([LLVM_VERSION_MAJOR])
46 AC_SUBST([LLVM_VERSION_MINOR])
47 AC_SUBST([LLVM_VERSION_PATCH])
48 AC_SUBST([LLVM_VERSION_SUFFIX])
3649
3750 dnl Provide a copyright substitution and ensure the copyright notice is included
3851 dnl in the output of --version option of the generated configure script.
0 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.60 for LLVM 3.5svn.
2 # Generated by GNU Autoconf 2.60 for LLVM 3.5.0svn.
33 #
44 # Report bugs to .
55 #
560560 # Identity of this package.
561561 PACKAGE_NAME='LLVM'
562562 PACKAGE_TARNAME='llvm'
563 PACKAGE_VERSION='3.5svn'
564 PACKAGE_STRING='LLVM 3.5svn'
563 PACKAGE_VERSION='3.5.0svn'
564 PACKAGE_STRING='LLVM 3.5.0svn'
565565 PACKAGE_BUGREPORT='http://llvm.org/bugs/'
566566
567567 ac_unique_file="lib/IR/Module.cpp"
640640 target_alias
641641 LLVM_VERSION_MAJOR
642642 LLVM_VERSION_MINOR
643 LLVM_VERSION_PATCH
644 LLVM_VERSION_SUFFIX
643645 LLVM_COPYRIGHT
644646 CC
645647 CFLAGS
13231325 # Omit some internal or obsolete options to make the list less imposing.
13241326 # This message is too long to be a string in the A/UX 3.1 sh.
13251327 cat <<_ACEOF
1326 \`configure' configures LLVM 3.5svn to adapt to many kinds of systems.
1328 \`configure' configures LLVM 3.5.0svn to adapt to many kinds of systems.
13271329
13281330 Usage: $0 [OPTION]... [VAR=VALUE]...
13291331
13891391
13901392 if test -n "$ac_init_help"; then
13911393 case $ac_init_help in
1392 short | recursive ) echo "Configuration of LLVM 3.5svn:";;
1394 short | recursive ) echo "Configuration of LLVM 3.5.0svn:";;
13931395 esac
13941396 cat <<\_ACEOF
13951397
15601562 test -n "$ac_init_help" && exit $ac_status
15611563 if $ac_init_version; then
15621564 cat <<\_ACEOF
1563 LLVM configure 3.5svn
1565 LLVM configure 3.5.0svn
15641566 generated by GNU Autoconf 2.60
15651567
15661568 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15761578 This file contains any messages produced by compilers while
15771579 running configure, to aid debugging if configure makes a mistake.
15781580
1579 It was created by LLVM $as_me 3.5svn, which was
1581 It was created by LLVM $as_me 3.5.0svn, which was
15801582 generated by GNU Autoconf 2.60. Invocation command line was
15811583
15821584 $ $0 $@
19301932
19311933
19321934
1933
1934 cat >>confdefs.h <<\_ACEOF
1935 #define LLVM_VERSION_MAJOR 3
1936 _ACEOF
1937
1938 LLVM_VERSION_MAJOR='3'
1939
1940
1941
1942
1943 cat >>confdefs.h <<\_ACEOF
1944 #define LLVM_VERSION_MINOR 5
1945 _ACEOF
1946
1947 LLVM_VERSION_MINOR='5'
1935 LLVM_VERSION_MAJOR=3
1936 LLVM_VERSION_MINOR=5
1937 LLVM_VERSION_PATCH=0
1938 LLVM_VERSION_SUFFIX=svn
1939
1940
1941 cat >>confdefs.h <<_ACEOF
1942 #define LLVM_VERSION_MAJOR $LLVM_VERSION_MAJOR
1943 _ACEOF
1944
1945
1946 cat >>confdefs.h <<_ACEOF
1947 #define LLVM_VERSION_MINOR $LLVM_VERSION_MINOR
1948 _ACEOF
1949
1950
1951 cat >>confdefs.h <<_ACEOF
1952 #define LLVM_VERSION_PATCH $LLVM_VERSION_PATCH
1953 _ACEOF
1954
1955
1956
1957
19481958
19491959
19501960
1982819838 # report actual input values of CONFIG_FILES etc. instead of their
1982919839 # values after options handling.
1983019840 ac_log="
19831 This file was extended by LLVM $as_me 3.5svn, which was
19841 This file was extended by LLVM $as_me 3.5.0svn, which was
1983219842 generated by GNU Autoconf 2.60. Invocation command line was
1983319843
1983419844 CONFIG_FILES = $CONFIG_FILES
1988119891 _ACEOF
1988219892 cat >>$CONFIG_STATUS <<_ACEOF
1988319893 ac_cs_version="\\
19884 LLVM config.status 3.5svn
19894 LLVM config.status 3.5.0svn
1988519895 configured by $0, generated by GNU Autoconf 2.60,
1988619896 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1988719897
2012120131 target_alias!$target_alias$ac_delim
2012220132 LLVM_VERSION_MAJOR!$LLVM_VERSION_MAJOR$ac_delim
2012320133 LLVM_VERSION_MINOR!$LLVM_VERSION_MINOR$ac_delim
20134 LLVM_VERSION_PATCH!$LLVM_VERSION_PATCH$ac_delim
20135 LLVM_VERSION_SUFFIX!$LLVM_VERSION_SUFFIX$ac_delim
2012420136 LLVM_COPYRIGHT!$LLVM_COPYRIGHT$ac_delim
2012520137 CC!$CC$ac_delim
2012620138 CFLAGS!$CFLAGS$ac_delim
2017720189 EXPENSIVE_CHECKS!$EXPENSIVE_CHECKS$ac_delim
2017820190 DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
2017920191 DEBUG_SYMBOLS!$DEBUG_SYMBOLS$ac_delim
20180 KEEP_SYMBOLS!$KEEP_SYMBOLS$ac_delim
20181 JIT!$JIT$ac_delim
2018220192 _ACEOF
2018320193
2018420194 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2022020230 ac_delim='%!_!# '
2022120231 for ac_last_try in false false false false false :; do
2022220232 cat >conf$$subs.sed <<_ACEOF
20233 KEEP_SYMBOLS!$KEEP_SYMBOLS$ac_delim
20234 JIT!$JIT$ac_delim
2022320235 TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
2022420236 TARGETS_WITH_JIT!$TARGETS_WITH_JIT$ac_delim
2022520237 ENABLE_DOCS!$ENABLE_DOCS$ac_delim
2031520327 LLVM_INFODIR!$LLVM_INFODIR$ac_delim
2031620328 LLVM_MANDIR!$LLVM_MANDIR$ac_delim
2031720329 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
20318 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
20319 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
2032020330 _ACEOF
2032120331
2032220332 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2035820368 ac_delim='%!_!# '
2035920369 for ac_last_try in false false false false false :; do
2036020370 cat >conf$$subs.sed <<_ACEOF
20371 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
20372 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
2036120373 OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2036220374 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
2036320375 RPATH!$RPATH$ac_delim
2036720379 LTLIBOBJS!$LTLIBOBJS$ac_delim
2036820380 _ACEOF
2036920381
20370 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
20382 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
2037120383 break
2037220384 elif $ac_last_try; then
2037320385 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
590590 /* Minor version of the LLVM API */
591591 #undef LLVM_VERSION_MINOR
592592
593 /* Patch version of the LLVM API */
594 #undef LLVM_VERSION_PATCH
595
593596 /* The shared library extension */
594597 #undef LTDL_SHLIB_EXT
595598
99 LEVEL := ../..
1010
1111 LIBRARYNAME = LLVM-$(LLVMVersion)
12 LIBRARYALIASNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)
1213
1314 NO_BUILD_ARCHIVE := 1
1415 LINK_LIBS_IN_SHARED := 1
1516 SHARED_LIBRARY := 1
17 SHARED_ALIAS := 1
1618
1719 include $(LEVEL)/Makefile.config
1820