[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1875794 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
From:       hartmannathan () apache ! org
Date:       2020-03-27 22:11:03
Message-ID: 20200327221103.5CC7317B4A6 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: hartmannathan
Date: Fri Mar 27 22:11:03 2020
New Revision: 1875794

URL: http://svn.apache.org/viewvc?rev=1875794&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Run htpasswd with LD_LIBRARY_PATH set.
  This fixes a problem on my system where htpasswd could not find the db lib
  built by this makefile and therefore failed to load, preventing httpd setup
  and serf tests. See dev@ mail thread "Late night unix-build weirdness" on
  2020/03/27 archived at:
  https://lists.apache.org/thread.html/rcf296d047a9711fc99c7534487d79a6cbaaca47efbc9c962d2d7fce5%40%3Cdev.subversion.apache.org%3E


Reviewed by: stsp

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1875794&r1=1875793&r2=1875794&view=diff
 ==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Mar 27 22:11:03 2020
@@ -1820,11 +1820,11 @@ $(HTTPD_CHECK_GROUPS):
 
 $(HTTPD_CHECK_CONF): $(MOD_DONTDOTHAT_CONF) $(HTTPD_CHECK_GROUPS)
 	mkdir -p $(dir $@)
-	$(PREFIX)/httpd/bin/htpasswd -bc $(HTTPD_CHECK_USERS).tmp jrandom rayjandom
-	$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp jconstant rayjandom
-	$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp __dumpster__ __loadster__
-	$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp JRANDOM rayjandom
-	$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp JCONSTANT rayjandom
+	env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PREFIX)/httpd/bin/htpasswd -bc \
$(HTTPD_CHECK_USERS).tmp jrandom rayjandom +	env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp jconstant rayjandom +	env \
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PREFIX)/httpd/bin/htpasswd -b \
$(HTTPD_CHECK_USERS).tmp __dumpster__ __loadster__ +	env \
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PREFIX)/httpd/bin/htpasswd -b \
$(HTTPD_CHECK_USERS).tmp JRANDOM rayjandom +	env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
$(PREFIX)/httpd/bin/htpasswd -b $(HTTPD_CHECK_USERS).tmp JCONSTANT rayjandom  mv -f \
$(HTTPD_CHECK_USERS).tmp $(HTTPD_CHECK_USERS)  echo > $@.tmp '# httpd config for make \
check'  echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"'


[prev in list] [next in list] [prev in thread] [next in thread]