hi, Laca the FLAC c++ component is not used by anything in Solaris so far, we think it would be safe to remove them all.
And Sorry that I don't know about the discussion. So what do you recommend in this case? Thanks --Irene Laszlo (Laca) Peter wrote: > Quick question: > > >> JDS should not ship flac c++ binary and headers >> > > Why? > > I think I know your answer: because of the CC/g++ ABI incompatibility > issues. But I don't think the right answer is to zap all C++ stuff > (JDS should not ship firefox c++ binary and headers?!?). In an > earlier discussion @opensolaris.org we came to the conclusion that > shipping a g++-built variant in /usr/gnu is a better solution. > Not that it's important in this case. > > Laca > > On Tue, 2007-05-22 at 17:22 +0800, Irene Huang wrote: > >> Hi, all >> >> the attached is the patch for bug 6559191 JDS should not ship flac c++ >> binary and headers ( http://bt2ws.central.sun.com/CrPrint?id=6559191) >> for review. >> >> Thanks >> >> >> --Irene >> plain text document attachment (flac++.diff.txt) >> Index: ChangeLog >> =================================================================== >> --- ChangeLog (revision 11351) >> +++ ChangeLog (working copy) >> @@ -1,3 +1,9 @@ >> +2007-05-18 Irene Huang <irene.huang at sun.com> >> + >> + * SUNWflac.spec: >> + * base-specs/flac.spec: >> + * patches/flac-02-c++.diff: >> + >> 2007-05-17 Damien Carbery <damien.carbery at sun.com> >> >> * SUNWmyspell-dictionary-l10n.spec: Correct invalid locale in -extra >> Index: patches/flac-02-c++.diff >> =================================================================== >> --- patches/flac-02-c++.diff (revision 0) >> +++ patches/flac-02-c++.diff (revision 0) >> @@ -0,0 +1,82 @@ >> +--- flac-1.1.4/configure.in.orig 2007-04-04 15:41:12.790627000 +0800 >> ++++ flac-1.1.4/configure.in 2007-04-04 15:41:37.441029000 +0800 >> +@@ -219,6 +219,16 @@ >> + fi >> + AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR") >> + >> ++dnl build FLAC++ or not >> ++AC_ARG_ENABLE(cpp, >> ++AC_HELP_STRING([--disable-cpp], [Do not build FLAC++]), >> ++[case "${enableval}" in >> ++ yes) disable_cplusplus=false ;; >> ++ no) disable_cplusplus=true ;; >> ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-cpp) ;; >> ++esac], [disable_cplusplus=false]) >> ++AM_CONDITIONAL(FLaC__WITH_CPLUSPLUS, [test "x$disable_cplusplus" != xtrue]) >> ++ >> + dnl check for ogg library >> + AC_ARG_ENABLE([ogg], >> + AC_HELP_STRING([--disable-ogg], [Disable ogg support (default: test >> for libogg)]), >> +--- flac-1.1.4/include/Makefile.am.orig 2007-04-09 >> 14:37:00.523096000 +0800 >> ++++ flac-1.1.4/include/Makefile.am 2007-04-09 14:37:20.226640000 +0800 >> +@@ -14,5 +14,8 @@ >> + # it may be distributed under the Xiph.Org license, which is the least >> + # restrictive of those mentioned above. See the file COPYING.Xiph in this >> + # distribution. >> ++if FLaC__WITH_CPLUSPLUS >> ++FLAC_CPLUSPLUS_DIR = FLAC++ >> ++endif >> + >> +-SUBDIRS = FLAC FLAC++ share test_libs_common >> ++SUBDIRS = FLAC $(FLAC_CPLUSPLUS_DIR) share test_libs_common >> +--- flac-1.1.4/src/Makefile.am.orig 2007-05-18 14:56:23.768590000 +0800 >> ++++ flac-1.1.4/src/Makefile.am 2007-05-18 14:54:35.049633000 +0800 >> +@@ -19,9 +19,13 @@ >> + XMMS_DIRS = plugin_common plugin_xmms >> + endif >> + >> ++if FLaC__WITH_CPLUSPLUS >> ++FLAC_CPLUSPLUS_DIR = libFLAC++ test_libFLAC++ >> ++endif >> ++ >> + SUBDIRS = \ >> + libFLAC \ >> +- libFLAC++ \ >> ++ $(FLAC_CPLUSPLUS_DIR) \ >> + share \ >> + flac \ >> + metaflac \ >> +@@ -31,7 +35,6 @@ >> + test_grabbag \ >> + test_libs_common \ >> + test_libFLAC \ >> +- test_libFLAC++ \ >> + test_seeking \ >> + test_streams >> + >> +--- flac-1.1.4/test/Makefile.am.orig 2007-05-18 14:56:31.917251000 +0800 >> ++++ flac-1.1.4/test/Makefile.am 2007-05-18 14:55:55.827946000 +0800 >> +@@ -19,9 +19,13 @@ >> + >> + SUBDIRS = cuesheets flac-to-flac-metadata-test-files metaflac-test-files >> pictures >> + >> ++if FLaC__WITH_CPLUSPLUS >> ++FLAC_CPLUSPLUS_FILE = test_libFLAC++.sh >> ++endif >> ++ >> + TESTS = \ >> + ./test_libFLAC.sh \ >> +- ./test_libFLAC++.sh \ >> ++ $(FLAC_CPLUSPLUS_FILE) \ >> + ./test_grabbag.sh \ >> + ./test_flac.sh \ >> + ./test_metaflac.sh \ >> +@@ -35,7 +39,7 @@ >> + metaflac.flac.ok \ >> + picture.ok \ >> + test_libFLAC.sh \ >> +- test_libFLAC++.sh \ >> ++ $(FLAC_CPLUSPLUS_FILE) \ >> + test_flac.sh \ >> + test_metaflac.sh \ >> + test_grabbag.sh \ >> Index: SUNWflac.spec >> =================================================================== >> --- SUNWflac.spec (revision 11351) >> +++ SUNWflac.spec (working copy) >> @@ -113,7 +113,6 @@ >> %hard %{_bindir}/metaflac >> %dir %attr (0755, root, bin) %{_libdir} >> %{_libdir}/libFLAC.so* >> -%{_libdir}/libFLAC++.so* >> %dir %attr (0755, root, sys) %{_datadir} >> %dir %attr(0755, root, bin) %{_mandir} >> %dir %attr(0755, root, bin) %{_mandir}/man1 >> Index: base-specs/flac.spec >> =================================================================== >> --- base-specs/flac.spec (revision 11351) >> +++ base-specs/flac.spec (working copy) >> @@ -19,6 +19,7 @@ >> Source: >> http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz >> #owner:yippi date:2005-08-12 type:bug bugid:1701960 >> Patch1: flac-01-forte.diff >> +#owner:sh162551 date:2007-05-22 type:bug bugid:1723295 >> +Patch2: flac-02-c++.diff >> URL: http://flac.sourceforge.net/ >> BuildRoot: %{_tmppath}/%{name}-%{version}-build >> Docdir: %{_docdir}/%{name} >> @@ -47,6 +48,7 @@ >> perl -pi -e 's/^M$//' src/share/replaygain_analysis/replaygain_analysis.c >> %ifos solaris >> %patch1 -p1 >> +%patch2 -p1 >> %endif >> >> %build >> @@ -64,12 +66,15 @@ >> export CFLAGS="%{optflags}" >> export CXXFLAGS="%{?cxx_optflags}" >> export LDFLAGS="%{?_ldflags}" >> +aclocal $ACLOCAL_FLAGS -I ./m4 >> libtoolize --force --copy >> autoheader >> +automake -a -c -f >> autoconf >> ./configure --prefix=%{_prefix} \ >> --bindir=%{_bindir} \ >> --libdir=%{_libdir} \ >> + --disable-cpp \ >> --sysconfdir=%{_sysconfdir} \ >> %{?sse_opt} \ >> --mandir=%{_mandir} >> > >
