[as-devel] PATCH: ldconfig failure should not be critical

• Messages sorted by: [ date ][ subject ][ author ]
• Next message: "[as-devel] CVS commit to afterstep-stable"
• Previous message: CaT "[as-devel] PATCH: fix needed library check for ascp"

--raC6veAxrt5nqIoY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

If you compile afterstep as a non-root user ldconfig fails. Because it
fails make aborts parsing the Makefile at that point and not everything
that should get installed gets installed. This patch is my attenpt
at fixing that (tested it. it works. installed size went from about 15MB
to about 23MB).

-- 
Martin's distress was in contrast to the bitter satisfaction of some
of his fellow marines as they surveyed the scene. "The Iraqis are sick
people and we are the chemotherapy," said Corporal Ryan Dupre. "I am
starting to hate this country. Wait till I get hold of a friggin' Iraqi.
No, I won't get hold of one. I'll just kill him."
	- http://www.informationclearinghouse.info/article2479.htm

--raC6veAxrt5nqIoY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="afterstep-cvs20030623.ldconfigfailstopsmakefix.patch"

diff -aur afterstep-stable.static/autoconf/Makefile.common.lib.in afterstep-stable/autoconf/Makefile.common.lib.in
--- afterstep-stable.static/autoconf/Makefile.common.lib.in	Sat May 10 05:28:22 2003
+++ afterstep-stable/autoconf/Makefile.common.lib.in	Mon Jun 23 19:03:50 2003
@@ -25,7 +25,7 @@
 		    	    echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \
 			fi; \
 			echo "$(LDCONFIG)"; \
-			$(LDCONFIG); \
+			$(LDCONFIG) || true; \
 		    fi ;\
 		fi \
 		)
@@ -50,7 +50,7 @@
 		     echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \
 		   fi; \
 		   echo "$(LDCONFIG)"; \
-		   $(LDCONFIG); \
+		   $(LDCONFIG) || true; \
 		 fi \
 		)
 
diff -aur afterstep-stable.static/libAfterBase/Makefile.in afterstep-stable/libAfterBase/Makefile.in
--- afterstep-stable.static/libAfterBase/Makefile.in	Fri May 23 03:12:11 2003
+++ afterstep-stable/libAfterBase/Makefile.in	Mon Jun 23 18:17:31 2003
@@ -103,7 +103,7 @@
 		    	    echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \
 			fi; \
 			echo "$(LDCONFIG)"; \
-			$(LDCONFIG); \
+			$(LDCONFIG) || true; \
 		    fi ;\
 		fi \
 		)
@@ -128,7 +128,7 @@
 		     echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \
 		   fi; \
 		   echo "$(LDCONFIG)"; \
-		   $(LDCONFIG); \
+		   $(LDCONFIG) || true; \
 		 fi \
 		)
 
diff -aur afterstep-stable.static/libAfterImage/Makefile.in afterstep-stable/libAfterImage/Makefile.in
--- afterstep-stable.static/libAfterImage/Makefile.in	Fri May 23 03:12:11 2003
+++ afterstep-stable/libAfterImage/Makefile.in	Mon Jun 23 18:17:47 2003
@@ -105,7 +105,7 @@
 		    	    echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \
 			fi; \
 			echo "$(LDCONFIG)"; \
-			$(LDCONFIG); \
+			$(LDCONFIG) || true; \
 		    fi ;\
 		fi \
 		)
@@ -129,7 +129,7 @@
 		     echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \
 		   fi; \
 		   echo "$(LDCONFIG)"; \
-		   $(LDCONFIG); \
+		   $(LDCONFIG) || true; \
 		 fi \
 		)
 

--raC6veAxrt5nqIoY--

• Next message: "[as-devel] CVS commit to afterstep-stable"
• Previous message: CaT "[as-devel] PATCH: fix needed library check for ascp"