914245 - move FORCE_SHARED_LIB to mozbuild

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Joey Armstrong [:joey]]

% find . -name 'Makefile.in' | xargs grep FORCE_SHARED_LIB
./gfx/angle/src/libGLESv2/Makefile.in:FORCE_SHARED_LIB = 1
./gfx/angle/src/libEGL/Makefile.in:FORCE_SHARED_LIB = 1
./js/src/Makefile.in:FORCE_SHARED_LIB = 1
./js/xpconnect/tests/components/native/Makefile.in:FORCE_SHARED_LIB = 1
./layout/media/Makefile.in:FORCE_SHARED_LIB = 1
./mozglue/build/Makefile.in:FORCE_SHARED_LIB = 1
./mozglue/build/Makefile.in:ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
./mozglue/build/Makefile.in:ifdef FORCE_SHARED_LIB
./extensions/gnomevfs/Makefile.in:FORCE_SHARED_LIB= 1
./extensions/widgetutils/src/Makefile.in:FORCE_SHARED_LIB = 1
./db/sqlite3/src/Makefile.in:FORCE_SHARED_LIB = 1
./accessible/public/msaa/Makefile.in:FORCE_SHARED_LIB = 1
./accessible/public/ia2/Makefile.in:FORCE_SHARED_LIB = 1
./xpcom/tests/component_no_aslr/Makefile.in:FORCE_SHARED_LIB = 1
./xpcom/tests/component/Makefile.in:FORCE_SHARED_LIB = 1
./xpcom/tests/bug656331_component/Makefile.in:FORCE_SHARED_LIB = 1
./memory/mozalloc/Makefile.in:FORCE_SHARED_LIB= 1
./memory/replace/dmd/Makefile.in:FORCE_SHARED_LIB= 1
./memory/replace/dummy/Makefile.in:FORCE_SHARED_LIB = 1
./memory/replace/jemalloc/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/system/dbus/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/system/gnome/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/library/winvccorlib/Makefile.in:FORCE_SHARED_LIB=1
./toolkit/library/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/crashreporter/test/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/crashreporter/injector/Makefile.in:FORCE_SHARED_LIB = 1
./toolkit/components/ctypes/tests/Makefile.in:FORCE_SHARED_LIB = 1
./tools/jprof/stub/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/gb235/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/froyo/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/gb235/libstagefright/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/froyo/libstagefright/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/ics/libutils/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/ics/libstagefright/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/gb/libutils/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/gb/libstagefright/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/lib/hc/libstagefright/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/gb/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/hc/Makefile.in:FORCE_SHARED_LIB = 1
./media/omx-plugin/Makefile.in:FORCE_SHARED_LIB = 1
./build/win32/vmwarerecordinghelper/Makefile.in:FORCE_SHARED_LIB = 1
./build/win32/crashinjectdll/Makefile.in:FORCE_SHARED_LIB = 1
./security/build/Makefile.in:FORCE_SHARED_LIB = 1
./dom/plugins/ipc/interpose/Makefile.in:FORCE_SHARED_LIB = 1
./browser/components/build/Makefile.in:FORCE_SHARED_LIB = 1

Comment 1

[Joey Armstrong [:joey]]

passthrough variable already added, Makefile.in still needs to be converted.

Comment 2

[Mike Hommey [:glandium]]

Attachment: Move FORCE_SHARED_LIB to moz.build.

Comment 3

[Mike Hommey [:glandium]]

Attachment: Move FORCE_SHARED_LIB to moz.build.

Comment 4

[Mike Hommey [:glandium]]

Attachment: Move FORCE_SHARED_LIB to moz.build.

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 832871 [details] [diff] [review]
Move FORCE_SHARED_LIB to moz.build.

Breaks js standalone

Comment 6

[Mike Hommey [:glandium]]

Attachment: Move FORCE_SHARED_LIB to moz.build.

Comment 7

[Michael Shal [:mshal]]

Comment on attachment 832879 [details] [diff] [review]
Move FORCE_SHARED_LIB to moz.build.

>diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
>--- a/gfx/angle/src/libEGL/moz.build
>+++ b/gfx/angle/src/libEGL/moz.build
>@@ -16,9 +16,12 @@ SOURCES += ['../common/' + src for src i
> SOURCES += [
>     'Config.cpp',
>     'Display.cpp',
>     'libEGL.cpp',
>     'main.cpp',
>     'Surface.cpp',
> ]
> 
>+# On Windows, we don't automatically get "lib" prepended, but we need it.
> LIBRARY_NAME = 'libEGL'

Thanks for moving these comments to the correct variable. Looks like I missed that on a previous review :/

>diff --git a/toolkit/library/winvccorlib/Makefile.in b/toolkit/library/winvccorlib/Makefile.in
>-# When we're linking GTest we recurse into this directory but don't need
>-# to generate this library

Not sure if it was intentional, but this comment wasn't carried over to moz.build

Comment 8

[Mike Hommey [:glandium]]

https://hg.mozilla.org/mozilla-central/rev/ec4d30f2de51