This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 5283f381b66897dbcd37fa2761cf0e60a9132a31 (commit) from 6aa55147cc76293d58f4a696065cedee9a98b3c0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5283f381b66897dbcd37fa2761cf0e60a9132a31 Author: Phil Carns <[email protected]> Date: Thu Sep 25 17:09:07 2014 -0500 clean up pkgconfig file for aesop ----------------------------------------------------------------------- Summary of changes: toolchain/configure.ac | 8 +------- toolchain/maint/aesop.pc.in | 8 ++++---- 2 files changed, 5 insertions(+), 11 deletions(-) Diff of changes: diff --git a/toolchain/configure.ac b/toolchain/configure.ac index b042139..b251754 100644 --- a/toolchain/configure.ac +++ b/toolchain/configure.ac @@ -88,7 +88,6 @@ LIBS="$C_UTILS_LIBS $LIBS" CFLAGS="$C_UTILS_CFLAGS $CFLAGS" dnl unfortunately pkg-config doesn't separate cppflags/cflags CPPFLAGS="$C_UTILS_CPPFLAGS $CPPFLAGS" -AESOP_PKGCONFIG_LIBS="${AESOP_PKGCONFIG_LIBS} $C_UTILS_LIBS" dnl ==================================================== @@ -149,10 +148,6 @@ LIBS="$OPENPA_LIBS $LIBS" CFLAGS="$OPENPA_CFLAGS $CFLAGS" dnl unfortunately pkg-config doesn't separate cppflags/cflags CPPFLAGS="$OPENPA_CPPFLAGS $CPPFLAGS" -dnl installad aesop lib will depend on opa lib, and installed aesop headers -dnl will depend on opa includes -AESOP_PKGCONFIG_LIBS="${AESOP_PKGCONFIG_LIBS} $OPENPA_LIBS" -AESOP_PKGCONFIG_CFLAGS="${AESOP_PKGCONFIG_CFLAGS} $OPENPA_CFLAGS" dnl ========================================================================== dnl check for unix variants @@ -279,9 +274,8 @@ AC_TRY_LINK( AECC_CFLAGS="" AC_SUBST(AECC_CFLAGS) -AESOP_PKGCONFIG_LIBS="${AESOP_PKGCONFIG_LIBS} ${THREAD_LIB}" +AESOP_PKGCONFIG_LIBS="${AESOP_PKGCONFIG_LIBS} -lpthread" AC_SUBST(AESOP_PKGCONFIG_LIBS) -AC_SUBST(AESOP_PKGCONFIG_CFLAGS) AC_CONFIG_FILES([bin/aecc-utils], []) AC_CONFIG_FILES([bin/aecc], [chmod +x bin/aecc]) diff --git a/toolchain/maint/aesop.pc.in b/toolchain/maint/aesop.pc.in index 99e4f3b..04fc39b 100644 --- a/toolchain/maint/aesop.pc.in +++ b/toolchain/maint/aesop.pc.in @@ -3,7 +3,6 @@ exec_prefix = @exec_prefix@ libdir=@libdir@ includedir=@includedir@ aesop_pkgconfig_libs=@AESOP_PKGCONFIG_LIBS@ -aesop_pkgconfig_cflags=@AESOP_PKGCONFIG_CFLAGS@ db_lib=@DB_LIB@ db_ldflags=@DB_LDFLAGS@ db_cflags=@DB_CFLAGS@ @@ -12,6 +11,7 @@ Name: aesop Description: language for high concurrency system software development Version: @AESOP_VERSION@ URL: http://www.mcs.anl.gov/projects/aesop -Requires: -Libs: ${db_ldflags} -L${libdir} ${db_lib} -laesop ${aesop_pkgconfig_libs} -Cflags: -I${includedir} ${db_cflags} ${aesop_pkgconfig_cflags} +Requires: c-utils openpa +Libs: -L${libdir} -laesop +Libs.private: ${db_ldflags} ${db_lib} ${aesop_pkgconfig_libs} +Cflags: -I${includedir} ${db_cflags} hooks/post-receive --