encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Don't duplicate Libs in Libs.private in pkg-config file 

pkg-config already prepends Libs to Libs.private when you specify
--static so there's no need to duplicate them. Most other projects
don't do this.
This commit is contained in:
James Le Cuirot 2020-04-12 13:24:36 +01:00
parent 99f87a7158
commit abcc6706fd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1962,7 +1962,7 @@ Libs.private:")
# Clean up the different lists # Clean up the different lists
listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") listtostr(EXTRA_LIBS _EXTRA_LIBS "-l")
set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) set(SDL_STATIC_LIBS ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
list(REMOVE_DUPLICATES SDL_STATIC_LIBS) list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
listtostr(SDL_STATIC_LIBS _SDL_STATIC_LIBS) listtostr(SDL_STATIC_LIBS _SDL_STATIC_LIBS)
set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})

2
configure vendored
View File

@ -25717,7 +25717,7 @@ else
SDL_RLD_FLAGS="" SDL_RLD_FLAGS=""
fi fi
SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS" SDL_STATIC_LIBS="$EXTRA_LDFLAGS"

2
configure.ac
View File

@ -4271,7 +4271,7 @@ else
SDL_RLD_FLAGS="" SDL_RLD_FLAGS=""
fi fi
SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS" SDL_STATIC_LIBS="$EXTRA_LDFLAGS"
dnl Expand the cflags and libraries needed by apps using SDL dnl Expand the cflags and libraries needed by apps using SDL
AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_CFLAGS)

2
sdl2-config.in
View File

@ -49,7 +49,7 @@ while test $# -gt 0; do
@ENABLE_SHARED_TRUE@ ;; @ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_STATIC_LIBS@ @ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_LIBS@ @SDL_STATIC_LIBS@
@ENABLE_STATIC_TRUE@ ;; @ENABLE_STATIC_TRUE@ ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2