d/rules: Properly build run_with_lock (#833538).
authorAaron M. Ucko <ucko@debian.org>
Fri, 5 Aug 2016 23:37:34 +0000 (19:37 -0400)
committerAaron M. Ucko <ucko@debian.org>
Fri, 5 Aug 2016 23:38:54 +0000 (19:38 -0400)
Don't actually install it, of course.

debian/changelog
debian/rules

index c349ddfb740ac0a096dc793c4c05d7174d11a57f..5378c4564c8024a98af7a4cd0bebed9ea22fb85e 100644 (file)
@@ -1,8 +1,10 @@
 ncbi-blast+ (2.4.0-3) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * debian/rules: Properly build (but don't install) run_with_lock.
+    (Closes: #833538.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:34:40 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:37:34 -0400
 
 ncbi-blast+ (2.4.0-2) unstable; urgency=medium
 
index ae92289c2f54ee985d2436b911f61f63ebaba942..464a554b58823342757fe70f332885befcd08ac4 100755 (executable)
@@ -39,6 +39,9 @@ endif
 
 export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MAKE
 
+# used for run_with_lock
+DEB_CONFIGURE_EXTRA_FLAGS +=  CFLAGS_FOR_BUILD="$(CFLAGS) -fPIE"
+DEB_CONFIGURE_EXTRA_FLAGS += LDFLAGS_FOR_BUILD="$(LDFLAGS)"
 
 llp=LD_LIBRARY_PATH
 override_dh_auto_configure:
@@ -77,7 +80,7 @@ override_dh_install-arch:
           $(instroot)/bin/windowmasker_2.2.22_adapter
 # Clean up tests, demos, and internal build tools
        rm -f $(instroot)/bin/*test* $(instroot)/bin/seqdb_demo \
-           $(instroot)/bin/datatool \
+           $(instroot)/bin/datatool $(instroot)/bin/run_with_lock \
            $(instroot)/bin/project_tree_builder
        for x in $(instroot)/bin/*; do \
            LD_LIBRARY_PATH=c++/BUILD/lib ldd $$x; \