diff options
| author | Qing He <qing.he@intel.com> | 2011-01-11 17:09:12 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-30 12:09:52 -0800 |
| commit | 114cee75bd4753c19b254a6d81b4d1284cbfa863 (patch) | |
| tree | 81614d9759140182fd757b94461402342c33e19c /meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch | |
| parent | 483ee172cf522969a7e5eb7f81ba2be412db9ee4 (diff) | |
| download | poky-114cee75bd4753c19b254a6d81b4d1284cbfa863.tar.gz | |
zypper: upgrade to newer git version
this works with rpm 5.4.0
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch')
| -rw-r--r-- | meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch b/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch index 0da196f5be..a7d3fbe50c 100644 --- a/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch +++ b/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch | |||
| @@ -42,8 +42,8 @@ Index: git/src/CMakeLists.txt | |||
| 42 | TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} ) | 42 | TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} ) |
| 43 | 43 | ||
| 44 | ADD_EXECUTABLE( zypper main.cc ) | 44 | ADD_EXECUTABLE( zypper main.cc ) |
| 45 | -TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} ) | 45 | -TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt ) |
| 46 | +TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} pthread rt ) | 46 | +TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt -lpthread ) |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | INSTALL( | 49 | INSTALL( |
| @@ -52,7 +52,7 @@ Index: git/src/CMakeLists.txt | |||
| 52 | # zypp-refresh utility | 52 | # zypp-refresh utility |
| 53 | ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc ) | 53 | ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc ) |
| 54 | -TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} ) | 54 | -TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} ) |
| 55 | +TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} pthread ) | 55 | +TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} -lpthread ) |
| 56 | INSTALL( | 56 | INSTALL( |
| 57 | TARGETS zypp-refresh | 57 | TARGETS zypp-refresh |
| 58 | RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin | 58 | RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin |