Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
ae177edc
Commit
ae177edc
authored
17 years ago
by
Moe Jette
Browse files
Options
Downloads
Patches
Plain Diff
Fix for clean AIX build, find openssl in proper location
parent
d1c6ca63
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/crypto/openssl/Makefile.am
+2
-2
2 additions, 2 deletions
src/plugins/crypto/openssl/Makefile.am
src/plugins/crypto/openssl/Makefile.in
+4
-2
4 additions, 2 deletions
src/plugins/crypto/openssl/Makefile.in
with
6 additions
and
4 deletions
src/plugins/crypto/openssl/Makefile.am
+
2
−
2
View file @
ae177edc
...
@@ -10,7 +10,7 @@ endif
...
@@ -10,7 +10,7 @@ endif
PLUGIN_FLAGS
=
-module
-avoid-version
--export-dynamic
PLUGIN_FLAGS
=
-module
-avoid-version
--export-dynamic
INCLUDES
=
-I
$(
top_srcdir
)
-I
$(
top_srcdir
)
/src/common
INCLUDES
=
-I
$(
top_srcdir
)
$(
SSL_CPPFLAGS
)
-I
$(
top_srcdir
)
/src/common
pkglib_LTLIBRARIES
=
$(
openssl_lib
)
pkglib_LTLIBRARIES
=
$(
openssl_lib
)
...
@@ -21,7 +21,7 @@ crypto_openssl_la_SOURCES = \
...
@@ -21,7 +21,7 @@ crypto_openssl_la_SOURCES = \
# Add libslurm to switch_elan to provide some symbols that are not
# Add libslurm to switch_elan to provide some symbols that are not
# available in slurmctld (slurm_setenvpf)
# available in slurmctld (slurm_setenvpf)
crypto_openssl_la_LIBADD
=
$(
OPEN
_LIBS
)
\
crypto_openssl_la_LIBADD
=
$(
SSL
_LIBS
)
\
$(
top_builddir
)
/src/api/libslurm.la
$(
top_builddir
)
/src/api/libslurm.la
crypto_openssl_la_LDFLAGS
=
$(
SO_LDFLAGS
)
$(
PLUGIN_FLAGS
)
crypto_openssl_la_LDFLAGS
=
$(
SO_LDFLAGS
)
$(
PLUGIN_FLAGS
)
...
...
This diff is collapsed.
Click to expand it.
src/plugins/crypto/openssl/Makefile.in
+
4
−
2
View file @
ae177edc
...
@@ -74,7 +74,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
...
@@ -74,7 +74,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs
=
"
$(
DESTDIR
)$(
pkglibdir
)
"
am__installdirs
=
"
$(
DESTDIR
)$(
pkglibdir
)
"
pkglibLTLIBRARIES_INSTALL
=
$(
INSTALL
)
pkglibLTLIBRARIES_INSTALL
=
$(
INSTALL
)
LTLIBRARIES
=
$(
pkglib_LTLIBRARIES
)
LTLIBRARIES
=
$(
pkglib_LTLIBRARIES
)
am__DEPENDENCIES_1
=
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_DEPENDENCIES
=
\
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_DEPENDENCIES
=
\
@HAVE_OPENSSL_TRUE@
$(
am__DEPENDENCIES_1
)
\
@HAVE_OPENSSL_TRUE@
$(
top_builddir
)
/src/api/libslurm.la
@HAVE_OPENSSL_TRUE@
$(
top_builddir
)
/src/api/libslurm.la
am__crypto_openssl_la_SOURCES_DIST
=
crypto_openssl.c
am__crypto_openssl_la_SOURCES_DIST
=
crypto_openssl.c
@HAVE_OPENSSL_TRUE@
am_crypto_openssl_la_OBJECTS
=
crypto_openssl.lo
@HAVE_OPENSSL_TRUE@
am_crypto_openssl_la_OBJECTS
=
crypto_openssl.lo
...
@@ -267,7 +269,7 @@ AUTOMAKE_OPTIONS = foreign
...
@@ -267,7 +269,7 @@ AUTOMAKE_OPTIONS = foreign
@HAVE_OPENSSL_FALSE@
openssl_lib
=
@HAVE_OPENSSL_FALSE@
openssl_lib
=
@HAVE_OPENSSL_TRUE@
openssl_lib
=
crypto_openssl.la
@HAVE_OPENSSL_TRUE@
openssl_lib
=
crypto_openssl.la
PLUGIN_FLAGS
=
-module
-avoid-version
--export-dynamic
PLUGIN_FLAGS
=
-module
-avoid-version
--export-dynamic
INCLUDES
=
-I
$(
top_srcdir
)
-I
$(
top_srcdir
)
/src/common
INCLUDES
=
-I
$(
top_srcdir
)
$(
SSL_CPPFLAGS
)
-I
$(
top_srcdir
)
/src/common
pkglib_LTLIBRARIES
=
$(
openssl_lib
)
pkglib_LTLIBRARIES
=
$(
openssl_lib
)
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_SOURCES
=
\
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_SOURCES
=
\
@HAVE_OPENSSL_TRUE@ crypto_openssl.c
@HAVE_OPENSSL_TRUE@ crypto_openssl.c
...
@@ -275,7 +277,7 @@ pkglib_LTLIBRARIES = $(openssl_lib)
...
@@ -275,7 +277,7 @@ pkglib_LTLIBRARIES = $(openssl_lib)
# Add libslurm to switch_elan to provide some symbols that are not
# Add libslurm to switch_elan to provide some symbols that are not
# available in slurmctld (slurm_setenvpf)
# available in slurmctld (slurm_setenvpf)
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_LIBADD
=
$(
OPEN
_LIBS
)
\
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_LIBADD
=
$(
SSL
_LIBS
)
\
@HAVE_OPENSSL_TRUE@
$(
top_builddir
)
/src/api/libslurm.la
@HAVE_OPENSSL_TRUE@
$(
top_builddir
)
/src/api/libslurm.la
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_LDFLAGS
=
$(
SO_LDFLAGS
)
$(
PLUGIN_FLAGS
)
@HAVE_OPENSSL_TRUE@
crypto_openssl_la_LDFLAGS
=
$(
SO_LDFLAGS
)
$(
PLUGIN_FLAGS
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment