diff mbox

Bug#766811: spurious library links

Message ID 29b6e6b8-46ff-ad69-9016-ab7bef89d809@debian.org (mailing list archive)
State Not Applicable
Headers show

Commit Message

Michael Biebl March 17, 2017, 8:42 p.m. UTC 
Am 17.03.2017 um 16:50 schrieb Nathan Scott:
> Hi Michael,
> 
> Yes, please go right ahead with NMU -

Done. I've just uploaded xfsprogs_4.9.0+nmu1

 I will follow up with the XFS
> folks when I can.

debdiff is attached. It slightly differs from Marco's original patch.
Instead of disabling the code, I simply removed it. This should be more
suitable for upstreaming.

Regards,
Michael
diff mbox

Patch

diff -Nru xfsprogs-4.9.0/debian/changelog xfsprogs-4.9.0+nmu1/debian/changelog
--- xfsprogs-4.9.0/debian/changelog	2017-01-05 23:05:55.000000000 +0100
+++ xfsprogs-4.9.0+nmu1/debian/changelog	2017-03-17 19:27:58.000000000 +0100
@@ -1,3 +1,11 @@ 
+xfsprogs (4.9.0+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove code in include/buildmacros which creates bogus symlinks for
+    libraries. (Closes: #766811)
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 17 Mar 2017 19:27:58 +0100
+
 xfsprogs (4.9.0) unstable; urgency=low
 
   * New upstream release
diff -Nru xfsprogs-4.9.0/include/buildmacros xfsprogs-4.9.0+nmu1/include/buildmacros
--- xfsprogs-4.9.0/include/buildmacros	2017-01-05 23:05:55.000000000 +0100
+++ xfsprogs-4.9.0+nmu1/include/buildmacros	2017-03-17 19:27:58.000000000 +0100
@@ -75,13 +75,7 @@ 
 	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
 	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-	fi
+	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR);
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
 endif