From 063bda511b17d6490176e257cead8c7b993e76c2 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 24 Jun 2019 16:04:20 +0200 Subject: [PATCH] [wip/py-sot-core-v3] remove patch-aa which has been applied upstream --- py-sot-core-v3/Makefile | 1 + py-sot-core-v3/distinfo | 1 - py-sot-core-v3/patches/patch-aa | 20 -------------------- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 py-sot-core-v3/patches/patch-aa diff --git a/py-sot-core-v3/Makefile b/py-sot-core-v3/Makefile index e205a1bf..eeb59beb 100644 --- a/py-sot-core-v3/Makefile +++ b/py-sot-core-v3/Makefile @@ -5,6 +5,7 @@ ORG= stack-of-tasks NAME= sot-core VERSION= 4.4.0 +PKGREVISION= 1 DISTNAME= ${NAME}-${VERSION} PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION} diff --git a/py-sot-core-v3/distinfo b/py-sot-core-v3/distinfo index 635adb2f..dbbaf790 100644 --- a/py-sot-core-v3/distinfo +++ b/py-sot-core-v3/distinfo @@ -1,4 +1,3 @@ SHA1 (sot-core-4.4.0.tar.gz) = e86d8be3e267711b1ed6ceb6a82675be984bc082 RMD160 (sot-core-4.4.0.tar.gz) = 2ba61574fd4bf475e10e141dfb0fe4efd0796a7f Size (sot-core-4.4.0.tar.gz) = 1103463 bytes -SHA1 (patch-aa) = c9046835b2583616c8d23b29d11902d74dba710f diff --git a/py-sot-core-v3/patches/patch-aa b/py-sot-core-v3/patches/patch-aa deleted file mode 100644 index 8ce34870..00000000 --- a/py-sot-core-v3/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -230,9 +230,13 @@ FOREACH(plugin ${plugins}) - sot-core-${PYTHON_LIBRARY_NAME}-wrap - ) - ENDIF(BUILD_PYTHON_INTERFACE) -- # Install plugins -- INSTALL(TARGETS ${LIBRARY_NAME} -- DESTINATION ${DYNAMIC_GRAPH_PLUGINDIR}) -+ -+ IF (NOT INSTALL_PYTHON_INTERFACE_ONLY) -+ # Install plugins -+ INSTALL(TARGETS ${LIBRARY_NAME} -+ DESTINATION ${DYNAMIC_GRAPH_PLUGINDIR}) -+ ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY) -+ - ENDFOREACH(plugin) - - IF(BUILD_PYTHON_INTERFACE) - -- GitLab