bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2008-04-15 19:07:51 -05:00
commit bf84c23266
5 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
acinclude.m4
View file

@ -3770,7 +3770,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
# #
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
_LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC])], [], [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;; "" | " "*) ;;
@ -3794,7 +3794,7 @@ esac
# #
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
_LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag, $lt_tmp_static_flag,
[], [],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])

13
configure.ac
View file

@ -186,13 +186,20 @@ GCC_VISIBILITY_CC
# Check if we have -fgnu89-inline flag # Check if we have -fgnu89-inline flag
GCC_GNU89_INLINE_CC GCC_GNU89_INLINE_CC
# Host-dependant flags # Host-dependant definitions
case "${host}" in case "${host_os}" in
*-*-cygwin*) cygwin*)
host_os_cygwin=yes
CFLAGS="$CFLAGS -DCYGWIN" CFLAGS="$CFLAGS -DCYGWIN"
;; ;;
darwin*)
host_os_darwin=yes
;;
esac esac
AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
# Check for architecture, used in default makepkg.conf # Check for architecture, used in default makepkg.conf
# (Note single space left after CARCHFLAGS) # (Note single space left after CARCHFLAGS)
case "${host}" in case "${host}" in

5
lib/libalpm/Makefile.am
View file

@ -10,8 +10,12 @@ DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@
AM_CFLAGS = -pedantic -D_GNU_SOURCE AM_CFLAGS = -pedantic -D_GNU_SOURCE
if ENABLE_VISIBILITY_CC if ENABLE_VISIBILITY_CC
if DARWIN
AM_CFLAGS += -fvisibility=hidden
else
AM_CFLAGS += -fvisibility=internal AM_CFLAGS += -fvisibility=internal
endif endif
endif
if ENABLE_GNU89_INLINE_CC if ENABLE_GNU89_INLINE_CC
AM_CFLAGS += -fgnu89-inline AM_CFLAGS += -fgnu89-inline
endif endif
@ -41,5 +45,6 @@ libalpm_la_SOURCES = \
util.h util.c util.h util.c
libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
libalpm_la_LIBADD = $(LTLIBINTL)
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet:

1
src/pacman/.gitignore vendored
View file

@ -3,3 +3,4 @@
pacman pacman
pacman.exe pacman.exe
pacman.static pacman.static
pacman.static.exe

3
src/pacman/Makefile.am
View file

@ -33,10 +33,9 @@ pacman_SOURCES = \
upgrade.c \ upgrade.c \
util.h util.c util.h util.c
pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la
pacman_static_SOURCES = $(pacman_SOURCES) pacman_static_SOURCES = $(pacman_SOURCES)
pacman_static_LDFLAGS = $(LDFLAGS) -all-static pacman_static_LDFLAGS = $(LDFLAGS) -all-static
pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet: