Bug 3779 - frysk.Config has multi-lib conflicts
Summary: frysk.Config has multi-lib conflicts
Status: RESOLVED FIXED
Alias: None
Product: frysk
Classification: Unclassified
Component: general (show other bugs)
Version: unspecified
: P2 normal
Target Milestone: ---
Assignee: Andrew Cagney
URL:
Keywords:
Depends on:
Blocks: 3413
  Show dependency tree / graph
 
Reported: 2006-12-21 21:00 UTC by Andrew Cagney
Modified: 2006-12-23 07:41 UTC (History)
0 users

See Also:
Host:
Target:
Build:
Last reconfirmed:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Cagney 2006-12-21 21:00:51 UTC 
This is comming from the substitution of things like the path and libprefix as
strings.  32- and 64-bit builds have different values.

Fix is to move that info to CNI and use accessor methods.
Comment 1 Andrew Cagney 2006-12-21 21:01:15 UTC 
Mine
Comment 2 Andrew Cagney 2006-12-21 21:01:40 UTC 
WIP:

Index: frysk-core/frysk/bindir/ChangeLog
2006-12-21  Andrew Cagney  <cagney@redhat.com>

        * ftrace.java: Use Config's getVersion, instead of VERSION.
        * fstep.java: Ditto.  Fix typo, program's name is "fstep".

Index: frysk-core/frysk/util/ChangeLog
2006-12-21  Andrew Cagney  <cagney@redhat.com>

        * Util.java: Use Config's getVersion, instead of VERSION.

Index: frysk-imports/common/ChangeLog
2006-12-21  Andrew Cagney  <cagney@redhat.com>

        * Makefile.rules (.cxxin.cxx): New rule.
        * Makefile.gen.sh: Add support for .cxxin.  Check .cxxin files for
        headers.

Index: frysk-imports/frysk/ChangeLog
2006-12-21  Andrew Cagney  <cagney@redhat.com>

        * Config.javain (VERSION): Delete.
        (getVersion): New native method.
        * cni/Config.cxxin: New file.
Comment 3 Andrew Cagney 2006-12-23 07:41:52 UTC 
Index: frysk-core/frysk/pkglibdir/ChangeLog
2006-12-23  Andrew Cagney  <cagney@redhat.com>

        * funit.java: Update, use Config's .getPkgDataDir, getPkgLibDir,
        and getPkgLib32Dir.

Index: frysk-gui/frysk/bindir/ChangeLog
2006-12-23  Andrew Cagney  <cagney@redhat.com>

        * frysk.java: Update, use Config's .getPkgDataDir,
        .getPkgImageDir, and getGladeDir.

Index: frysk-imports/frysk/ChangeLog
2006-12-23  Andrew Cagney  <cagney@redhat.com>

        * cni/Config.cxxin (getPkgDataDir, getPkgLibDir, getPkgLib32Dir)
        (getImageDir, getGladeDir, getPkgDataDir): New.
        * Config.javain (getPkgLibDir): Replace PKGLIBDIR.
        (getPkgLib32Dir): Replace PKGLIB32DIR.
        (getPkgDataDir): Replace PKGDATADIR.
        (getGladeDir): Replace GLADEDIR.
        (getImageDir): Replace IMAGEDIR.
        (PREFIX, BINDIR, LIBDIR, DATADIR): Comment out.
        (PKGINCLUDEDIR): Comment out.