mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
Remove pacman.static build from build files
This presents plenty of problems on OSes besides Linux, and even on Linux when the libtool file for libarchive isn't present. The static build isn't all that useful anyway as missing something such as glibc will still leave you unable to run the pacman.static binary. Remove it from the formal build process. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
8741908276
commit
95995ae93f
16
configure.ac
16
configure.ac
@ -119,11 +119,6 @@ AC_ARG_ENABLE(git-version,
|
||||
[enable use of git version in version string if available]),
|
||||
[wantgitver=$enableval], [wantgitver=no])
|
||||
|
||||
# Help line for pacman.static
|
||||
AC_ARG_ENABLE(pacman-static,
|
||||
AS_HELP_STRING([--disable-pacman-static], [do not build static version of pacman]),
|
||||
[pacmanstatic=$enableval], [pacmanstatic=yes])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_AWK
|
||||
AC_PROG_CC_C99
|
||||
@ -324,16 +319,6 @@ else
|
||||
fi
|
||||
AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes")
|
||||
|
||||
# Enable or disable inclusion of pacman.static
|
||||
AC_MSG_CHECKING(whether to build pacman.static)
|
||||
if test "x$pacmanstatic" = "xyes" ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([INCLUDE_PACMAN_STATIC], , [Build pacman.static])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AM_CONDITIONAL(INCLUDE_PACMAN_STATIC, test "x$pacmanstatic" = "xyes")
|
||||
|
||||
# Set root directory
|
||||
AC_SUBST(ROOTDIR)
|
||||
# Set package file extension
|
||||
@ -398,7 +383,6 @@ ${PACKAGE_NAME}:
|
||||
Doxygen support : ${usedoxygen}
|
||||
Asciidoc support : ${useasciidoc}
|
||||
debug support : ${debug}
|
||||
build pacman.static : ${pacmanstatic}
|
||||
"
|
||||
|
||||
# vim:set ts=2 sw=2 noet:
|
||||
|
2
src/pacman/.gitignore
vendored
2
src/pacman/.gitignore
vendored
@ -2,5 +2,3 @@
|
||||
.libs
|
||||
pacman
|
||||
pacman.exe
|
||||
pacman.static
|
||||
pacman.static.exe
|
||||
|
@ -6,10 +6,6 @@ logfile = ${localstatedir}/log/pacman.log
|
||||
|
||||
bin_PROGRAMS = pacman
|
||||
|
||||
if INCLUDE_PACMAN_STATIC
|
||||
bin_PROGRAMS += pacman.static
|
||||
endif
|
||||
|
||||
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
||||
-DCONFFILE=\"$(conffile)\" \
|
||||
-DROOTDIR=\"$(ROOTDIR)\" \
|
||||
@ -40,7 +36,4 @@ pacman_SOURCES = \
|
||||
|
||||
LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la
|
||||
|
||||
pacman_static_SOURCES = $(pacman_SOURCES)
|
||||
pacman_static_LDFLAGS = $(LDFLAGS) -all-static
|
||||
|
||||
# vim:set ts=2 sw=2 noet:
|
||||
|
Loading…
Reference in New Issue
Block a user