llvm.org GIT mirror llvm / 709048c
Merging r202720: ------------------------------------------------------------------------ r202720 | thomas.stellard | 2014-03-03 07:22:00 -0800 (Mon, 03 Mar 2014) | 8 lines 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/branches/release_34@204262 91177308-0d34-0410-b5e6-96231b3b80d8 Tom Stellard 5 years ago
7 changed file(s) with 95 addition(s) and 52 deletion(s). Raw diff Collapse all Expand all
1111
1212 set(LLVM_VERSION_MAJOR 3)
1313 set(LLVM_VERSION_MINOR 4)
14 set(LLVM_VERSION_PATCH 0)
1415
1516 if (NOT PACKAGE_VERSION)
16 set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
17 set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
1718 endif()
1819
1920 option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
4142 set(CPACK_PACKAGE_VENDOR "LLVM")
4243 set(CPACK_PACKAGE_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
4344 set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_MINOR})
45 set(CPACK_PACKAGE_VERSION_PATCH ${LLVM_VERSION_PATCH})
4446 set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
4547 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.TXT")
4648 if(WIN32 AND NOT UNIX)
1414 # Define LLVM specific info and directories based on the autoconf variables
1515 LLVMPackageName := @PACKAGE_TARNAME@
1616 LLVMVersion := @PACKAGE_VERSION@
17 LLVM_VERSION_MAJOR := @LLVM_VERSION_MAJOR@
18 LLVM_VERSION_MINOR := @LLVM_VERSION_MINOR@
19 LLVM_VERSION_PATCH := @LLVM_VERSION_PATCH@
20 LLVM_VERSION_SUFFIX := @LLVM_VERSION_SUFFIX@
1721 LLVM_CONFIGTIME := @LLVM_CONFIGTIME@
1822
1923 ###########################################################################
756756 Ranlib = ranlib
757757 endif
758758
759 AliasTool = ln -s
759 AliasTool = ln -sf
760760
761761 #----------------------------------------------------------
762762 # Get the list of source files and compute object file
11201120
11211121 # Make sure there isn't any extraneous whitespace on the LIBRARYNAME option
11221122 LIBRARYNAME := $(strip $(LIBRARYNAME))
1123 LIBRARYALIASNAME := $(strip $(LIBRARYALIASNAME))
11231124 ifdef LOADABLE_MODULE
11241125 BaseLibName.A := $(LIBRARYNAME).a
11251126 BaseLibName.SO := $(LIBRARYNAME)$(SHLIBEXT)
1127 BaseAliasName.SO := $(LIBRARYALIASNAME)$(SHLIBEXT)
11261128 else
11271129 BaseLibName.A := lib$(LIBRARYNAME).a
11281130 BaseLibName.SO := $(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)
1131 BaseAliasName.SO := $(SharedPrefix)$(LIBRARYALIASNAME)$(SHLIBEXT)
11291132 endif
11301133 LibName.A := $(LibDir)/$(BaseLibName.A)
11311134 LibName.SO := $(SharedLibDir)/$(BaseLibName.SO)
1135 AliasName.SO := $(SharedLibDir)/$(BaseAliasName.SO)
11321136 LibName.O := $(LibDir)/$(LIBRARYNAME).o
11331137
11341138 #---------------------------------------------------------
11821186 DestSharedLibDir := $(DESTDIR)$(PROJ_libdir)
11831187 endif
11841188 DestSharedLib := $(DestSharedLibDir)/$(BaseLibName.SO)
1189 DestSharedAlias := $(DestSharedLibDir)/$(BaseAliasName.SO)
11851190
11861191 install-local:: $(DestSharedLib)
11871192
11881193 $(DestSharedLib): $(LibName.SO) $(DestSharedLibDir)
11891194 $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
11901195 $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
1196 ifdef SHARED_ALIAS
1197 $(Echo) Creating alias from $(DestSharedLib) to $(DestSharedAlias)
1198 $(Verb) $(AliasTool) $(DestSharedLib) $(DestSharedAlias)
1199 endif
11911200
11921201 uninstall-local::
11931202 $(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.4],[http://llvm.org/bugs/])
34 AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
35 AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API])
33
34 AC_INIT([LLVM],[3.4.0],[http://llvm.org/bugs/])
35
36 LLVM_VERSION_MAJOR=3
37 LLVM_VERSION_MINOR=4
38 LLVM_VERSION_PATCH=0
39 LLVM_VERSION_SUFFIX=
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.4.
2 # Generated by GNU Autoconf 2.60 for LLVM 3.4.0.
33 #
44 # Report bugs to .
55 #
560560 # Identity of this package.
561561 PACKAGE_NAME='LLVM'
562562 PACKAGE_TARNAME='llvm'
563 PACKAGE_VERSION='3.4'
564 PACKAGE_STRING='LLVM 3.4'
563 PACKAGE_VERSION='3.4.0'
564 PACKAGE_STRING='LLVM 3.4.0'
565565 PACKAGE_BUGREPORT='http://llvm.org/bugs/'
566566
567567 ac_unique_file="lib/IR/Module.cpp"
638638 build_alias
639639 host_alias
640640 target_alias
641 LLVM_VERSION_MAJOR
642 LLVM_VERSION_MINOR
643 LLVM_VERSION_PATCH
644 LLVM_VERSION_SUFFIX
641645 LLVM_COPYRIGHT
642646 CC
643647 CFLAGS
13291333 # Omit some internal or obsolete options to make the list less imposing.
13301334 # This message is too long to be a string in the A/UX 3.1 sh.
13311335 cat <<_ACEOF
1332 \`configure' configures LLVM 3.4 to adapt to many kinds of systems.
1336 \`configure' configures LLVM 3.4.0 to adapt to many kinds of systems.
13331337
13341338 Usage: $0 [OPTION]... [VAR=VALUE]...
13351339
13951399
13961400 if test -n "$ac_init_help"; then
13971401 case $ac_init_help in
1398 short | recursive ) echo "Configuration of LLVM 3.4:";;
1402 short | recursive ) echo "Configuration of LLVM 3.4.0:";;
13991403 esac
14001404 cat <<\_ACEOF
14011405
15631567 test -n "$ac_init_help" && exit $ac_status
15641568 if $ac_init_version; then
15651569 cat <<\_ACEOF
1566 LLVM configure 3.4
1570 LLVM configure 3.4.0
15671571 generated by GNU Autoconf 2.60
15681572
15691573 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15791583 This file contains any messages produced by compilers while
15801584 running configure, to aid debugging if configure makes a mistake.
15811585
1582 It was created by LLVM $as_me 3.4, which was
1586 It was created by LLVM $as_me 3.4.0, which was
15831587 generated by GNU Autoconf 2.60. Invocation command line was
15841588
15851589 $ $0 $@
19331937
19341938
19351939
1936 cat >>confdefs.h <<\_ACEOF
1937 #define LLVM_VERSION_MAJOR 3
1938 _ACEOF
1939
1940
1941 cat >>confdefs.h <<\_ACEOF
1942 #define LLVM_VERSION_MINOR 4
1943 _ACEOF
1940 LLVM_VERSION_MAJOR=3
1941 LLVM_VERSION_MINOR=4
1942 LLVM_VERSION_PATCH=0
1943 LLVM_VERSION_SUFFIX=
1944
1945
1946 cat >>confdefs.h <<_ACEOF
1947 #define LLVM_VERSION_MAJOR $LLVM_VERSION_MAJOR
1948 _ACEOF
1949
1950
1951 cat >>confdefs.h <<_ACEOF
1952 #define LLVM_VERSION_MINOR $LLVM_VERSION_MINOR
1953 _ACEOF
1954
1955
1956 cat >>confdefs.h <<_ACEOF
1957 #define LLVM_VERSION_PATCH $LLVM_VERSION_PATCH
1958 _ACEOF
1959
1960
1961
1962
1963
19441964
19451965
19461966 LLVM_COPYRIGHT="Copyright (c) 2003-2013 University of Illinois at Urbana-Champaign."
88248844 fi
88258845
88268846
8827 if test x"${enable_ltdl_install-no}" != xno; then
8847
8848
8849 if test x"${enable_ltdl_install-no}" != xno; then
88288850 INSTALL_LTDL_TRUE=
88298851 INSTALL_LTDL_FALSE='#'
88308852 else
88328854 INSTALL_LTDL_FALSE=
88338855 fi
88348856
8835 if test x"${enable_ltdl_convenience-no}" != xno; then
8857
8858
8859 if test x"${enable_ltdl_convenience-no}" != xno; then
88368860 CONVENIENCE_LTDL_TRUE=
88378861 CONVENIENCE_LTDL_FALSE='#'
88388862 else
1058110605 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1058210606 lt_status=$lt_dlunknown
1058310607 cat > conftest.$ac_ext <
10584 #line 10585 "configure"
10608 #line 10609 "configure"
1058510609 #include "confdefs.h"
1058610610
1058710611 #if HAVE_DLFCN_H
2274422768 # report actual input values of CONFIG_FILES etc. instead of their
2274522769 # values after options handling.
2274622770 ac_log="
22747 This file was extended by LLVM $as_me 3.4, which was
22771 This file was extended by LLVM $as_me 3.4.0, which was
2274822772 generated by GNU Autoconf 2.60. Invocation command line was
2274922773
2275022774 CONFIG_FILES = $CONFIG_FILES
2279722821 _ACEOF
2279822822 cat >>$CONFIG_STATUS <<_ACEOF
2279922823 ac_cs_version="\\
22800 LLVM config.status 3.4
22824 LLVM config.status 3.4.0
2280122825 configured by $0, generated by GNU Autoconf 2.60,
2280222826 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2280322827
2303523059 build_alias!$build_alias$ac_delim
2303623060 host_alias!$host_alias$ac_delim
2303723061 target_alias!$target_alias$ac_delim
23062 LLVM_VERSION_MAJOR!$LLVM_VERSION_MAJOR$ac_delim
23063 LLVM_VERSION_MINOR!$LLVM_VERSION_MINOR$ac_delim
23064 LLVM_VERSION_PATCH!$LLVM_VERSION_PATCH$ac_delim
23065 LLVM_VERSION_SUFFIX!$LLVM_VERSION_SUFFIX$ac_delim
2303823066 LLVM_COPYRIGHT!$LLVM_COPYRIGHT$ac_delim
2303923067 CC!$CC$ac_delim
2304023068 CFLAGS!$CFLAGS$ac_delim
2309123119 ENABLE_WERROR!$ENABLE_WERROR$ac_delim
2309223120 ENABLE_EXPENSIVE_CHECKS!$ENABLE_EXPENSIVE_CHECKS$ac_delim
2309323121 EXPENSIVE_CHECKS!$EXPENSIVE_CHECKS$ac_delim
23094 DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
23095 DEBUG_SYMBOLS!$DEBUG_SYMBOLS$ac_delim
23096 KEEP_SYMBOLS!$KEEP_SYMBOLS$ac_delim
23097 JIT!$JIT$ac_delim
2309823122 _ACEOF
2309923123
2310023124 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2313623160 ac_delim='%!_!# '
2313723161 for ac_last_try in false false false false false :; do
2313823162 cat >conf$$subs.sed <<_ACEOF
23163 DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
23164 DEBUG_SYMBOLS!$DEBUG_SYMBOLS$ac_delim
23165 KEEP_SYMBOLS!$KEEP_SYMBOLS$ac_delim
23166 JIT!$JIT$ac_delim
2313923167 TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
2314023168 ENABLE_DOCS!$ENABLE_DOCS$ac_delim
2314123169 ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
2322923257 LLVM_INCLUDEDIR!$LLVM_INCLUDEDIR$ac_delim
2323023258 LLVM_INFODIR!$LLVM_INFODIR$ac_delim
2323123259 LLVM_MANDIR!$LLVM_MANDIR$ac_delim
23232 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
23233 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
23234 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
23235 OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2323623260 _ACEOF
2323723261
2323823262 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2327423298 ac_delim='%!_!# '
2327523299 for ac_last_try in false false false false false :; do
2327623300 cat >conf$$subs.sed <<_ACEOF
23301 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
23302 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
23303 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
23304 OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2327723305 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
2327823306 RPATH!$RPATH$ac_delim
2327923307 RDYNAMIC!$RDYNAMIC$ac_delim
2328223310 LTLIBOBJS!$LTLIBOBJS$ac_delim
2328323311 _ACEOF
2328423312
23285 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
23313 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
2328623314 break
2328723315 elif $ac_last_try; then
2328823316 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
11
22 #ifndef CONFIG_H
33 #define CONFIG_H
4
5 /* Define if building universal (internal helper macro) */
6 #undef AC_APPLE_UNIVERSAL_BUILD
74
85 /* Bug report URL. */
96 #undef BUG_REPORT_URL
640637 /* Minor version of the LLVM API */
641638 #undef LLVM_VERSION_MINOR
642639
640 /* Patch version of the LLVM API */
641 #undef LLVM_VERSION_PATCH
642
643643 /* Define if the OS needs help to load dependent libraries for dlopen(). */
644644 #undef LTDL_DLOPEN_DEPLIBS
645645
672672 /* Define to the one symbol short name of this package. */
673673 #undef PACKAGE_TARNAME
674674
675 /* Define to the home page for this package. */
676 #undef PACKAGE_URL
677
678675 /* Define to the version of this package. */
679676 #undef PACKAGE_VERSION
680677
699696 /* Type of 1st arg on ELM Callback */
700697 #undef WIN32_ELMCB_PCSTR
701698
702 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
703 significant byte first (like Motorola and SPARC, unlike Intel). */
704 #if defined AC_APPLE_UNIVERSAL_BUILD
705 # if defined __BIG_ENDIAN__
706 # define WORDS_BIGENDIAN 1
707 # endif
708 #else
709 # ifndef WORDS_BIGENDIAN
710 # undef WORDS_BIGENDIAN
711 # endif
712 #endif
713
714699 /* Define to empty if `const' does not conform to ANSI C. */
715700 #undef const
716701
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