Michael R. Crusoe pushed to branch master at Debian Med / odgi
Commits: f1ca8a56 by Michael R. Crusoe at 2020-05-03T13:46:16+02:00 Respect the AMD64 baseline - - - - - 646d95b8 by Michael R. Crusoe at 2020-05-03T13:47:02+02:00 Test during the build - - - - - feae5d1e by Michael R. Crusoe at 2020-05-03T13:47:08+02:00 install more - - - - - 5 changed files: - debian/libodgi-dev.install - + debian/libodgi.install - + debian/patches/baseline - debian/patches/series - debian/rules Changes: ===================================== debian/libodgi-dev.install ===================================== @@ -1 +1,2 @@ usr/include/* +usr/lib/libodgi.a ===================================== debian/libodgi.install ===================================== @@ -0,0 +1,2 @@ +usr/lib/libodgi.so +usr/lib/odgi.cpython-*.so ===================================== debian/patches/baseline ===================================== @@ -0,0 +1,50 @@ +Author: Michael R. Cruso <[email protected]> +Description: Respect the amd64 baseline +--- odgi.orig/CMakeLists.txt ++++ odgi/CMakeLists.txt +@@ -8,8 +8,8 @@ + set(CMAKE_CXX_STANDARD 14) + + # Use all standard-compliant optimizations +-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS} -O3 -mcx16 -g") +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -O3 -mcx16 -g") ++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS} -O3 -g") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -O3 -g") + + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # assumes clang build +--- odgi.orig/deps/sdsl-lite/CMakeLists.txt ++++ odgi/deps/sdsl-lite/CMakeLists.txt +@@ -82,19 +82,6 @@ + endif() + endif() + +-include(CheckSSE4_2) +-if( BUILTIN_POPCNT ) +- if( CMAKE_COMPILER_IS_GNUCXX ) +- append_cxx_compiler_flags("-msse4.2 -march=native" "GCC" CMAKE_CXX_OPT_FLAGS) +- endif() +- if( CMAKE_COMPILER_IS_GNUCXX ) +- append_cxx_compiler_flags("-msse4.2 -march=native" "CLANG" CMAKE_CXX_OPT_FLAGS) +- endif() +- if( CMAKE_COMPILER_IS_INTEL ) +- append_cxx_compiler_flags("-msse4.2 -march=native" "INTEL" CMAKE_CXX_FLAGS) +- endif() +-endif() +- + # check for demangle support to get pretty C++ class names + include(FindCxaDemangle) + if( HAVE_CXA_DEMANGLE ) +--- odgi.orig/src/main.cpp ++++ odgi/src/main.cpp +@@ -31,10 +31,6 @@ + cerr << endl << "For more commands, type `odgi help`." << endl; + } + +-// We make sure to compile main for the lowest common denominator architecture. +-// This works on GCC and Clang. But we have to decalre main and then define it. +-int main(int argc, char *argv[]) __attribute__((__target__("arch=x86-64"))); +- + int main(int argc, char *argv[]) { + + // set a higher value for tcmalloc warnings ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ use_packaged_libtsl-hopscotch-map-dev spelling +baseline ===================================== debian/rules ===================================== @@ -20,12 +20,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ -### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected -#override_dh_auto_test: -#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -# do_stuff_for_testing -#endif - -### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script -#get-orig-source: -# . debian/get-orig-source +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + bin/odgi test +endif View it on GitLab: https://salsa.debian.org/med-team/odgi/-/compare/48b9876c4e344d00970acf7ec31ff8a45e8cf65e...feae5d1eb0869299b386448cba710c3f59a7a81d -- View it on GitLab: https://salsa.debian.org/med-team/odgi/-/compare/48b9876c4e344d00970acf7ec31ff8a45e8cf65e...feae5d1eb0869299b386448cba710c3f59a7a81d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
