76179 - psm2 build broken attempting to build security/psm

Status: VERIFIED FIXED

(SeaMonkey :: Build Config, defect, P2)

Description

[Daniel (Leaf) Nunes]

The following diff removes the faulty attempt to run make in mozilla/security 
(where the Makefile tells the build to descend into security/psm 
unconditionally... and since we shouldn't be building in security/psm anymore, 
we shouldn't do that).

Can i get a witness?

Index: modules.mk
===================================================================
RCS file: /cvsroot/mozilla/build/unix/modules.mk,v
retrieving revision 1.25
diff -u -r1.25 modules.mk
--- modules.mk  2001/04/13 23:54:47     1.25
+++ modules.mk  2001/04/16 16:21:00
@@ -98,7 +98,7 @@
 #
 # psm2
 #
-BM_DIRS_psm2   = $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security 
security/manager
+BM_DIRS_psm2   = $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security/manager
 BM_DEP_DIRS_psm2= \
        $(BM_DEP_DIRS_xpcom) \
        netwerk/base/public netwerk/protocol/http/public netwerk/build \

Comment 1

[Javier Delgadillo]

r=javi

Comment 2

[Javier Delgadillo]

This would be an alternative fix that would probably work as well.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- Makefile.in 2001/04/12 18:54:02     1.3
+++ Makefile.in 2001/04/16 18:35:24
@@ -26,6 +26,6 @@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS           = psm
+DIRS           = manager
 
 include $(topsrcdir)/config/rules.mk

Comment 3

[Daniel (Leaf) Nunes]

yes, i'd have to agree with you. But in this case, building the old psm would be 
broken, so we might as well get rid of all the BUILD_MODULE=psm descriptions to 
hammer the nail into the coffin (and then cvs remove the contents of 
security/psm).

I'll toss a patch together, but this will look like s/psm//, then s/psm2/psm/

Comment 4

[Daniel (Leaf) Nunes]

r=leaf on the last patch, should probably check it in whenever you can.

Comment 5

[Javier Delgadillo]

patch to security/Makefile.in checked in.

Comment 6

[cls]

Marking fixed.

Comment 7

[Jon Granrose]

verified.